diff --git a/composer.lock b/composer.lock index 122050e..a94de03 100644 --- a/composer.lock +++ b/composer.lock @@ -54,16 +54,16 @@ }, { "name": "google/apiclient", - "version": "v2.2.4", + "version": "v2.4.0", "source": { "type": "git", "url": "https://github.com/googleapis/google-api-php-client.git", - "reference": "d6c7563bdf88d6a0719ea63e21c74dc86032364e" + "reference": "cd3c37998020d91ae4eafca4f26a92da4dabba83" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-api-php-client/zipball/d6c7563bdf88d6a0719ea63e21c74dc86032364e", - "reference": "d6c7563bdf88d6a0719ea63e21c74dc86032364e", + "url": "https://api.github.com/repos/googleapis/google-api-php-client/zipball/cd3c37998020d91ae4eafca4f26a92da4dabba83", + "reference": "cd3c37998020d91ae4eafca4f26a92da4dabba83", "shasum": "" }, "require": { @@ -72,7 +72,7 @@ "google/auth": "^1.0", "guzzlehttp/guzzle": "~5.3.1||~6.0", "guzzlehttp/psr7": "^1.2", - "monolog/monolog": "^1.17", + "monolog/monolog": "^1.17|^2.0", "php": ">=5.4", "phpseclib/phpseclib": "~0.3.10||~2.0" }, @@ -111,20 +111,20 @@ "keywords": [ "google" ], - "time": "2019-08-19T18:09:46+00:00" + "time": "2019-09-11T17:38:10+00:00" }, { "name": "google/apiclient-services", - "version": "v0.110", + "version": "v0.118", "source": { "type": "git", "url": "https://github.com/googleapis/google-api-php-client-services.git", - "reference": "9d9e0a4e180cf09a52ab04535ca4f669031f8c54" + "reference": "3db3c3097dcfb2e2cd578053f28be20fe4ad8e01" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/9d9e0a4e180cf09a52ab04535ca4f669031f8c54", - "reference": "9d9e0a4e180cf09a52ab04535ca4f669031f8c54", + "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/3db3c3097dcfb2e2cd578053f28be20fe4ad8e01", + "reference": "3db3c3097dcfb2e2cd578053f28be20fe4ad8e01", "shasum": "" }, "require": { @@ -148,20 +148,20 @@ "keywords": [ "google" ], - "time": "2019-08-17T00:23:23+00:00" + "time": "2019-10-14T00:24:06+00:00" }, { "name": "google/auth", - "version": "v1.5.2", + "version": "v1.6.0", "source": { "type": "git", "url": "https://github.com/googleapis/google-auth-library-php.git", - "reference": "2ee962e5df3e9427fda859f1b0515d6d62c4afa5" + "reference": "6d5455b4c0f4a58b1f1b4bdf2ba49221123698b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/2ee962e5df3e9427fda859f1b0515d6d62c4afa5", - "reference": "2ee962e5df3e9427fda859f1b0515d6d62c4afa5", + "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/6d5455b4c0f4a58b1f1b4bdf2ba49221123698b3", + "reference": "6d5455b4c0f4a58b1f1b4bdf2ba49221123698b3", "shasum": "" }, "require": { @@ -180,7 +180,7 @@ "sebastian/comparator": ">=1.2.3" }, "suggest": { - "phpseclib/phpseclib": "May be used in place of OpenSSL for signing strings. Please require version ^2." + "phpseclib/phpseclib": "May be used in place of OpenSSL for signing strings or for token management. Please require version ^2." }, "type": "library", "autoload": { @@ -199,7 +199,7 @@ "google", "oauth2" ], - "time": "2019-07-22T21:01:31+00:00" + "time": "2019-10-01T18:35:05+00:00" }, { "name": "guzzlehttp/guzzle", @@ -390,16 +390,16 @@ }, { "name": "mobiledetect/mobiledetectlib", - "version": "2.8.33", + "version": "2.8.34", "source": { "type": "git", "url": "https://github.com/serbanghita/Mobile-Detect.git", - "reference": "cd385290f9a0d609d2eddd165a1e44ec1bf12102" + "reference": "6f8113f57a508494ca36acbcfa2dc2d923c7ed5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/cd385290f9a0d609d2eddd165a1e44ec1bf12102", - "reference": "cd385290f9a0d609d2eddd165a1e44ec1bf12102", + "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/6f8113f57a508494ca36acbcfa2dc2d923c7ed5b", + "reference": "6f8113f57a508494ca36acbcfa2dc2d923c7ed5b", "shasum": "" }, "require": { @@ -424,9 +424,9 @@ "authors": [ { "name": "Serban Ghita", - "role": "Developer", "email": "serbanghita@gmail.com", - "homepage": "http://mobiledetect.net" + "homepage": "http://mobiledetect.net", + "role": "Developer" } ], "description": "Mobile_Detect is a lightweight PHP class for detecting mobile devices. It uses the User-Agent string combined with specific HTTP headers to detect the mobile environment.", @@ -438,25 +438,25 @@ "mobile detector", "php mobile detect" ], - "time": "2018-09-01T15:05:15+00:00" + "time": "2019-09-18T18:44:20+00:00" }, { "name": "monolog/monolog", - "version": "1.24.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266" + "reference": "68545165e19249013afd1d6f7485aecff07a2d22" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266", - "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/68545165e19249013afd1d6f7485aecff07a2d22", + "reference": "68545165e19249013afd1d6f7485aecff07a2d22", "shasum": "" }, "require": { - "php": ">=5.3.0", - "psr/log": "~1.0" + "php": "^7.2", + "psr/log": "^1.0.1" }, "provide": { "psr/log-implementation": "1.0.0" @@ -464,33 +464,36 @@ "require-dev": { "aws/aws-sdk-php": "^2.4.9 || ^3.0", "doctrine/couchdb": "~1.0@dev", - "graylog2/gelf-php": "~1.0", - "jakub-onderka/php-parallel-lint": "0.9", + "elasticsearch/elasticsearch": "^6.0", + "graylog2/gelf-php": "^1.4.2", + "jakub-onderka/php-parallel-lint": "^0.9", "php-amqplib/php-amqplib": "~2.4", "php-console/php-console": "^3.1.3", - "phpunit/phpunit": "~4.5", - "phpunit/phpunit-mock-objects": "2.3.0", + "phpspec/prophecy": "^1.6.1", + "phpunit/phpunit": "^8.3", + "predis/predis": "^1.1", + "rollbar/rollbar": "^1.3", "ruflin/elastica": ">=0.90 <3.0", - "sentry/sentry": "^0.13", "swiftmailer/swiftmailer": "^5.3|^6.0" }, "suggest": { "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", "doctrine/couchdb": "Allow sending log messages to a CouchDB server", + "elasticsearch/elasticsearch": "Allow sending log messages to an Elasticsearch server via official client", "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", - "ext-mongo": "Allow sending log messages to a MongoDB server", + "ext-mbstring": "Allow to work properly with unicode symbols", + "ext-mongodb": "Allow sending log messages to a MongoDB server (via driver)", "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", - "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver", + "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)", "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", "php-console/php-console": "Allow sending log messages to Google Chrome", "rollbar/rollbar": "Allow sending log messages to Rollbar", - "ruflin/elastica": "Allow sending log messages to an Elastic Search server", - "sentry/sentry": "Allow sending log messages to a Sentry server" + "ruflin/elastica": "Allow sending log messages to an Elastic Search server" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { @@ -516,20 +519,20 @@ "logging", "psr-3" ], - "time": "2018-11-05T09:00:11+00:00" + "time": "2019-08-30T09:56:44+00:00" }, { "name": "phpseclib/phpseclib", - "version": "2.0.21", + "version": "2.0.23", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "9f1287e68b3f283339a9f98f67515dd619e5bf9d" + "reference": "c78eb5058d5bb1a183133c36d4ba5b6675dfa099" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/9f1287e68b3f283339a9f98f67515dd619e5bf9d", - "reference": "9f1287e68b3f283339a9f98f67515dd619e5bf9d", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c78eb5058d5bb1a183133c36d4ba5b6675dfa099", + "reference": "c78eb5058d5bb1a183133c36d4ba5b6675dfa099", "shasum": "" }, "require": { @@ -563,28 +566,28 @@ "authors": [ { "name": "Jim Wigginton", - "role": "Lead Developer", - "email": "terrafrost@php.net" + "email": "terrafrost@php.net", + "role": "Lead Developer" }, { "name": "Patrick Monnerat", - "role": "Developer", - "email": "pm@datasphere.ch" + "email": "pm@datasphere.ch", + "role": "Developer" }, { "name": "Andreas Fischer", - "role": "Developer", - "email": "bantu@phpbb.com" + "email": "bantu@phpbb.com", + "role": "Developer" }, { "name": "Hans-Jürgen Petrich", - "role": "Developer", - "email": "petrich@tronic-media.com" + "email": "petrich@tronic-media.com", + "role": "Developer" }, { "name": "Graham Campbell", - "role": "Developer", - "email": "graham@alt-three.com" + "email": "graham@alt-three.com", + "role": "Developer" } ], "description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.", @@ -608,7 +611,7 @@ "x.509", "x509" ], - "time": "2019-07-12T12:53:49+00:00" + "time": "2019-09-17T03:41:22+00:00" }, { "name": "psr/cache", diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 6068dff..c31fbe5 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -382,100 +382,6 @@ "url" ] }, - { - "name": "phpseclib/phpseclib", - "version": "2.0.21", - "version_normalized": "2.0.21.0", - "source": { - "type": "git", - "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "9f1287e68b3f283339a9f98f67515dd619e5bf9d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/9f1287e68b3f283339a9f98f67515dd619e5bf9d", - "reference": "9f1287e68b3f283339a9f98f67515dd619e5bf9d", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phing/phing": "~2.7", - "phpunit/phpunit": "^4.8.35|^5.7|^6.0", - "sami/sami": "~2.0", - "squizlabs/php_codesniffer": "~2.0" - }, - "suggest": { - "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.", - "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.", - "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.", - "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations." - }, - "time": "2019-07-12T12:53:49+00:00", - "type": "library", - "installation-source": "dist", - "autoload": { - "files": [ - "phpseclib/bootstrap.php" - ], - "psr-4": { - "phpseclib\\": "phpseclib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jim Wigginton", - "role": "Lead Developer", - "email": "terrafrost@php.net" - }, - { - "name": "Patrick Monnerat", - "role": "Developer", - "email": "pm@datasphere.ch" - }, - { - "name": "Andreas Fischer", - "role": "Developer", - "email": "bantu@phpbb.com" - }, - { - "name": "Hans-Jürgen Petrich", - "role": "Developer", - "email": "petrich@tronic-media.com" - }, - { - "name": "Graham Campbell", - "role": "Developer", - "email": "graham@alt-three.com" - } - ], - "description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.", - "homepage": "http://phpseclib.sourceforge.net", - "keywords": [ - "BigInteger", - "aes", - "asn.1", - "asn1", - "blowfish", - "crypto", - "cryptography", - "encryption", - "rsa", - "security", - "sftp", - "signature", - "signing", - "ssh", - "twofish", - "x.509", - "x509" - ] - }, { "name": "psr/log", "version": "1.1.0", @@ -526,23 +432,117 @@ ] }, { - "name": "monolog/monolog", - "version": "1.24.0", - "version_normalized": "1.24.0.0", + "name": "phpseclib/phpseclib", + "version": "2.0.23", + "version_normalized": "2.0.23.0", "source": { "type": "git", - "url": "https://github.com/Seldaek/monolog.git", - "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266" + "url": "https://github.com/phpseclib/phpseclib.git", + "reference": "c78eb5058d5bb1a183133c36d4ba5b6675dfa099" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266", - "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c78eb5058d5bb1a183133c36d4ba5b6675dfa099", + "reference": "c78eb5058d5bb1a183133c36d4ba5b6675dfa099", "shasum": "" }, "require": { - "php": ">=5.3.0", - "psr/log": "~1.0" + "php": ">=5.3.3" + }, + "require-dev": { + "phing/phing": "~2.7", + "phpunit/phpunit": "^4.8.35|^5.7|^6.0", + "sami/sami": "~2.0", + "squizlabs/php_codesniffer": "~2.0" + }, + "suggest": { + "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.", + "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.", + "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.", + "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations." + }, + "time": "2019-09-17T03:41:22+00:00", + "type": "library", + "installation-source": "dist", + "autoload": { + "files": [ + "phpseclib/bootstrap.php" + ], + "psr-4": { + "phpseclib\\": "phpseclib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jim Wigginton", + "email": "terrafrost@php.net", + "role": "Lead Developer" + }, + { + "name": "Patrick Monnerat", + "email": "pm@datasphere.ch", + "role": "Developer" + }, + { + "name": "Andreas Fischer", + "email": "bantu@phpbb.com", + "role": "Developer" + }, + { + "name": "Hans-Jürgen Petrich", + "email": "petrich@tronic-media.com", + "role": "Developer" + }, + { + "name": "Graham Campbell", + "email": "graham@alt-three.com", + "role": "Developer" + } + ], + "description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.", + "homepage": "http://phpseclib.sourceforge.net", + "keywords": [ + "BigInteger", + "aes", + "asn.1", + "asn1", + "blowfish", + "crypto", + "cryptography", + "encryption", + "rsa", + "security", + "sftp", + "signature", + "signing", + "ssh", + "twofish", + "x.509", + "x509" + ] + }, + { + "name": "monolog/monolog", + "version": "2.0.0", + "version_normalized": "2.0.0.0", + "source": { + "type": "git", + "url": "https://github.com/Seldaek/monolog.git", + "reference": "68545165e19249013afd1d6f7485aecff07a2d22" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/68545165e19249013afd1d6f7485aecff07a2d22", + "reference": "68545165e19249013afd1d6f7485aecff07a2d22", + "shasum": "" + }, + "require": { + "php": "^7.2", + "psr/log": "^1.0.1" }, "provide": { "psr/log-implementation": "1.0.0" @@ -550,34 +550,37 @@ "require-dev": { "aws/aws-sdk-php": "^2.4.9 || ^3.0", "doctrine/couchdb": "~1.0@dev", - "graylog2/gelf-php": "~1.0", - "jakub-onderka/php-parallel-lint": "0.9", + "elasticsearch/elasticsearch": "^6.0", + "graylog2/gelf-php": "^1.4.2", + "jakub-onderka/php-parallel-lint": "^0.9", "php-amqplib/php-amqplib": "~2.4", "php-console/php-console": "^3.1.3", - "phpunit/phpunit": "~4.5", - "phpunit/phpunit-mock-objects": "2.3.0", + "phpspec/prophecy": "^1.6.1", + "phpunit/phpunit": "^8.3", + "predis/predis": "^1.1", + "rollbar/rollbar": "^1.3", "ruflin/elastica": ">=0.90 <3.0", - "sentry/sentry": "^0.13", "swiftmailer/swiftmailer": "^5.3|^6.0" }, "suggest": { "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", "doctrine/couchdb": "Allow sending log messages to a CouchDB server", + "elasticsearch/elasticsearch": "Allow sending log messages to an Elasticsearch server via official client", "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", - "ext-mongo": "Allow sending log messages to a MongoDB server", + "ext-mbstring": "Allow to work properly with unicode symbols", + "ext-mongodb": "Allow sending log messages to a MongoDB server (via driver)", "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", - "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver", + "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)", "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", "php-console/php-console": "Allow sending log messages to Google Chrome", "rollbar/rollbar": "Allow sending log messages to Rollbar", - "ruflin/elastica": "Allow sending log messages to an Elastic Search server", - "sentry/sentry": "Allow sending log messages to a Sentry server" + "ruflin/elastica": "Allow sending log messages to an Elastic Search server" }, - "time": "2018-11-05T09:00:11+00:00", + "time": "2019-08-30T09:56:44+00:00", "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "2.x-dev" } }, "installation-source": "dist", @@ -607,17 +610,17 @@ }, { "name": "google/apiclient-services", - "version": "v0.110", - "version_normalized": "0.110.0.0", + "version": "v0.118", + "version_normalized": "0.118.0.0", "source": { "type": "git", "url": "https://github.com/googleapis/google-api-php-client-services.git", - "reference": "9d9e0a4e180cf09a52ab04535ca4f669031f8c54" + "reference": "3db3c3097dcfb2e2cd578053f28be20fe4ad8e01" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/9d9e0a4e180cf09a52ab04535ca4f669031f8c54", - "reference": "9d9e0a4e180cf09a52ab04535ca4f669031f8c54", + "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/3db3c3097dcfb2e2cd578053f28be20fe4ad8e01", + "reference": "3db3c3097dcfb2e2cd578053f28be20fe4ad8e01", "shasum": "" }, "require": { @@ -626,7 +629,7 @@ "require-dev": { "phpunit/phpunit": "~4.8" }, - "time": "2019-08-17T00:23:23+00:00", + "time": "2019-10-14T00:24:06+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -646,17 +649,17 @@ }, { "name": "google/auth", - "version": "v1.5.2", - "version_normalized": "1.5.2.0", + "version": "v1.6.0", + "version_normalized": "1.6.0.0", "source": { "type": "git", "url": "https://github.com/googleapis/google-auth-library-php.git", - "reference": "2ee962e5df3e9427fda859f1b0515d6d62c4afa5" + "reference": "6d5455b4c0f4a58b1f1b4bdf2ba49221123698b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/2ee962e5df3e9427fda859f1b0515d6d62c4afa5", - "reference": "2ee962e5df3e9427fda859f1b0515d6d62c4afa5", + "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/6d5455b4c0f4a58b1f1b4bdf2ba49221123698b3", + "reference": "6d5455b4c0f4a58b1f1b4bdf2ba49221123698b3", "shasum": "" }, "require": { @@ -675,9 +678,9 @@ "sebastian/comparator": ">=1.2.3" }, "suggest": { - "phpseclib/phpseclib": "May be used in place of OpenSSL for signing strings. Please require version ^2." + "phpseclib/phpseclib": "May be used in place of OpenSSL for signing strings or for token management. Please require version ^2." }, - "time": "2019-07-22T21:01:31+00:00", + "time": "2019-10-01T18:35:05+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -699,17 +702,17 @@ }, { "name": "google/apiclient", - "version": "v2.2.4", - "version_normalized": "2.2.4.0", + "version": "v2.4.0", + "version_normalized": "2.4.0.0", "source": { "type": "git", "url": "https://github.com/googleapis/google-api-php-client.git", - "reference": "d6c7563bdf88d6a0719ea63e21c74dc86032364e" + "reference": "cd3c37998020d91ae4eafca4f26a92da4dabba83" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-api-php-client/zipball/d6c7563bdf88d6a0719ea63e21c74dc86032364e", - "reference": "d6c7563bdf88d6a0719ea63e21c74dc86032364e", + "url": "https://api.github.com/repos/googleapis/google-api-php-client/zipball/cd3c37998020d91ae4eafca4f26a92da4dabba83", + "reference": "cd3c37998020d91ae4eafca4f26a92da4dabba83", "shasum": "" }, "require": { @@ -718,7 +721,7 @@ "google/auth": "^1.0", "guzzlehttp/guzzle": "~5.3.1||~6.0", "guzzlehttp/psr7": "^1.2", - "monolog/monolog": "^1.17", + "monolog/monolog": "^1.17|^2.0", "php": ">=5.4", "phpseclib/phpseclib": "~0.3.10||~2.0" }, @@ -734,7 +737,7 @@ "suggest": { "cache/filesystem-adapter": "For caching certs and tokens (using Google_Client::setCache)" }, - "time": "2019-08-19T18:09:46+00:00", + "time": "2019-09-11T17:38:10+00:00", "type": "library", "extra": { "branch-alias": { @@ -762,17 +765,17 @@ }, { "name": "mobiledetect/mobiledetectlib", - "version": "2.8.33", - "version_normalized": "2.8.33.0", + "version": "2.8.34", + "version_normalized": "2.8.34.0", "source": { "type": "git", "url": "https://github.com/serbanghita/Mobile-Detect.git", - "reference": "cd385290f9a0d609d2eddd165a1e44ec1bf12102" + "reference": "6f8113f57a508494ca36acbcfa2dc2d923c7ed5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/cd385290f9a0d609d2eddd165a1e44ec1bf12102", - "reference": "cd385290f9a0d609d2eddd165a1e44ec1bf12102", + "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/6f8113f57a508494ca36acbcfa2dc2d923c7ed5b", + "reference": "6f8113f57a508494ca36acbcfa2dc2d923c7ed5b", "shasum": "" }, "require": { @@ -781,7 +784,7 @@ "require-dev": { "phpunit/phpunit": "~4.8.35||~5.7" }, - "time": "2018-09-01T15:05:15+00:00", + "time": "2019-09-18T18:44:20+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -799,9 +802,9 @@ "authors": [ { "name": "Serban Ghita", - "role": "Developer", "email": "serbanghita@gmail.com", - "homepage": "http://mobiledetect.net" + "homepage": "http://mobiledetect.net", + "role": "Developer" } ], "description": "Mobile_Detect is a lightweight PHP class for detecting mobile devices. It uses the User-Agent string combined with specific HTTP headers to detect the mobile environment.", diff --git a/vendor/google/apiclient-services/src/Google/Service/AbusiveExperienceReport/Resource/Sites.php b/vendor/google/apiclient-services/src/Google/Service/AbusiveExperienceReport/Resource/Sites.php index 1f51fd5..548d81a 100644 --- a/vendor/google/apiclient-services/src/Google/Service/AbusiveExperienceReport/Resource/Sites.php +++ b/vendor/google/apiclient-services/src/Google/Service/AbusiveExperienceReport/Resource/Sites.php @@ -26,15 +26,12 @@ class Google_Service_AbusiveExperienceReport_Resource_Sites extends Google_Service_Resource { /** - * Gets a summary of the abusive experience rating of a site. (sites.get) + * Gets a site's Abusive Experience Report summary. (sites.get) * - * @param string $name The required site name. This is the site property whose - * abusive experiences have been reviewed, and it must be URL-encoded. For - * example, sites/https%3A%2F%2Fwww.google.com. The server will return an error - * of BAD_REQUEST if this field is not filled in. Note that if the site property - * is not yet verified in Search Console, the reportUrl field returned by the - * API will lead to the verification page, prompting the user to go through that - * process before they can gain access to the Abusive Experience Report. + * @param string $name Required. The name of the site whose summary to get, e.g. + * `sites/http%3A%2F%2Fwww.google.com%2F`. + * + * Format: `sites/{site}` * @param array $optParams Optional parameters. * @return Google_Service_AbusiveExperienceReport_SiteSummaryResponse */ diff --git a/vendor/google/apiclient-services/src/Google/Service/AbusiveExperienceReport/Resource/ViolatingSites.php b/vendor/google/apiclient-services/src/Google/Service/AbusiveExperienceReport/Resource/ViolatingSites.php index 10072fb..baf1402 100644 --- a/vendor/google/apiclient-services/src/Google/Service/AbusiveExperienceReport/Resource/ViolatingSites.php +++ b/vendor/google/apiclient-services/src/Google/Service/AbusiveExperienceReport/Resource/ViolatingSites.php @@ -26,7 +26,7 @@ class Google_Service_AbusiveExperienceReport_Resource_ViolatingSites extends Google_Service_Resource { /** - * Lists sites with Abusive Experience Report statuses of "Failing". + * Lists sites that are failing in the Abusive Experience Report. * (violatingSites.listViolatingSites) * * @param array $optParams Optional parameters. diff --git a/vendor/google/apiclient-services/src/Google/Service/AccessApproval.php b/vendor/google/apiclient-services/src/Google/Service/AccessApproval.php index 6a24360..af68e9d 100644 --- a/vendor/google/apiclient-services/src/Google/Service/AccessApproval.php +++ b/vendor/google/apiclient-services/src/Google/Service/AccessApproval.php @@ -327,6 +327,10 @@ class Google_Service_AccessApproval extends Google_Service 'type' => 'string', 'required' => true, ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -335,10 +339,6 @@ class Google_Service_AccessApproval extends Google_Service 'location' => 'query', 'type' => 'integer', ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), ), ), ) diff --git a/vendor/google/apiclient-services/src/Google/Service/AccessApproval/Resource/Folders.php b/vendor/google/apiclient-services/src/Google/Service/AccessApproval/Resource/Folders.php index 48c3914..5314bef 100644 --- a/vendor/google/apiclient-services/src/Google/Service/AccessApproval/Resource/Folders.php +++ b/vendor/google/apiclient-services/src/Google/Service/AccessApproval/Resource/Folders.php @@ -52,8 +52,8 @@ class Google_Service_AccessApproval_Resource_Folders extends Google_Service_Reso * @param Google_Service_AccessApproval_AccessApprovalSettings $postBody * @param array $optParams Optional parameters. * - * @opt_param string updateMask The update mask applies to the settings. For the - * `FieldMask` definition, see https://developers.google.com/protocol- + * @opt_param string updateMask For the `FieldMask` definition, see + * https://developers.google.com/protocol- * buffers/docs/reference/google.protobuf#fieldmask If this field is left unset, * only the notification_emails field will be updated. * @return Google_Service_AccessApproval_AccessApprovalSettings diff --git a/vendor/google/apiclient-services/src/Google/Service/AccessApproval/Resource/Organizations.php b/vendor/google/apiclient-services/src/Google/Service/AccessApproval/Resource/Organizations.php index fa1a5cc..964dcae 100644 --- a/vendor/google/apiclient-services/src/Google/Service/AccessApproval/Resource/Organizations.php +++ b/vendor/google/apiclient-services/src/Google/Service/AccessApproval/Resource/Organizations.php @@ -52,8 +52,8 @@ class Google_Service_AccessApproval_Resource_Organizations extends Google_Servic * @param Google_Service_AccessApproval_AccessApprovalSettings $postBody * @param array $optParams Optional parameters. * - * @opt_param string updateMask The update mask applies to the settings. For the - * `FieldMask` definition, see https://developers.google.com/protocol- + * @opt_param string updateMask For the `FieldMask` definition, see + * https://developers.google.com/protocol- * buffers/docs/reference/google.protobuf#fieldmask If this field is left unset, * only the notification_emails field will be updated. * @return Google_Service_AccessApproval_AccessApprovalSettings diff --git a/vendor/google/apiclient-services/src/Google/Service/AccessApproval/Resource/Projects.php b/vendor/google/apiclient-services/src/Google/Service/AccessApproval/Resource/Projects.php index 00fe382..4b6726d 100644 --- a/vendor/google/apiclient-services/src/Google/Service/AccessApproval/Resource/Projects.php +++ b/vendor/google/apiclient-services/src/Google/Service/AccessApproval/Resource/Projects.php @@ -52,8 +52,8 @@ class Google_Service_AccessApproval_Resource_Projects extends Google_Service_Res * @param Google_Service_AccessApproval_AccessApprovalSettings $postBody * @param array $optParams Optional parameters. * - * @opt_param string updateMask The update mask applies to the settings. For the - * `FieldMask` definition, see https://developers.google.com/protocol- + * @opt_param string updateMask For the `FieldMask` definition, see + * https://developers.google.com/protocol- * buffers/docs/reference/google.protobuf#fieldmask If this field is left unset, * only the notification_emails field will be updated. * @return Google_Service_AccessApproval_AccessApprovalSettings diff --git a/vendor/google/apiclient-services/src/Google/Service/AccessApproval/Resource/ProjectsApprovalRequests.php b/vendor/google/apiclient-services/src/Google/Service/AccessApproval/Resource/ProjectsApprovalRequests.php index 407c93f..dfc1185 100644 --- a/vendor/google/apiclient-services/src/Google/Service/AccessApproval/Resource/ProjectsApprovalRequests.php +++ b/vendor/google/apiclient-services/src/Google/Service/AccessApproval/Resource/ProjectsApprovalRequests.php @@ -91,9 +91,6 @@ class Google_Service_AccessApproval_Resource_ProjectsApprovalRequests extends Go * "organizations/{organization_id}". * @param array $optParams Optional parameters. * - * @opt_param string pageToken A token identifying the page of results to - * return. - * @opt_param int pageSize Requested page size. * @opt_param string filter A filter on the type of approval requests to * retrieve. Must be one of the following values: * @@ -101,6 +98,9 @@ class Google_Service_AccessApproval_Resource_ProjectsApprovalRequests extends Go * requests. PENDING: Only pending requests. ACTIVE: Only active (i.e. * currently approved) requests. DISMISSED: Only dismissed (including expired) * requests. + * @opt_param string pageToken A token identifying the page of results to + * return. + * @opt_param int pageSize Requested page size. * @return Google_Service_AccessApproval_ListApprovalRequestsResponse */ public function listProjectsApprovalRequests($parent, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/AdExperienceReport/Resource/Sites.php b/vendor/google/apiclient-services/src/Google/Service/AdExperienceReport/Resource/Sites.php index fa2a739..5d0a848 100644 --- a/vendor/google/apiclient-services/src/Google/Service/AdExperienceReport/Resource/Sites.php +++ b/vendor/google/apiclient-services/src/Google/Service/AdExperienceReport/Resource/Sites.php @@ -26,15 +26,12 @@ class Google_Service_AdExperienceReport_Resource_Sites extends Google_Service_Resource { /** - * Gets a summary of the ad experience rating of a site. (sites.get) + * Gets a site's Ad Experience Report summary. (sites.get) * - * @param string $name The required site name. It should be the site property - * whose ad experiences may have been reviewed, and it should be URL-encoded. - * For example, sites/https%3A%2F%2Fwww.google.com. The server will return an - * error of BAD_REQUEST if this field is not filled in. Note that if the site - * property is not yet verified in Search Console, the reportUrl field returned - * by the API will lead to the verification page, prompting the user to go - * through that process before they can gain access to the Ad Experience Report. + * @param string $name Required. The name of the site whose summary to get, e.g. + * `sites/http%3A%2F%2Fwww.google.com%2F`. + * + * Format: `sites/{site}` * @param array $optParams Optional parameters. * @return Google_Service_AdExperienceReport_SiteSummaryResponse */ diff --git a/vendor/google/apiclient-services/src/Google/Service/AdExperienceReport/Resource/ViolatingSites.php b/vendor/google/apiclient-services/src/Google/Service/AdExperienceReport/Resource/ViolatingSites.php index d4df5a4..9cc5d4e 100644 --- a/vendor/google/apiclient-services/src/Google/Service/AdExperienceReport/Resource/ViolatingSites.php +++ b/vendor/google/apiclient-services/src/Google/Service/AdExperienceReport/Resource/ViolatingSites.php @@ -26,8 +26,8 @@ class Google_Service_AdExperienceReport_Resource_ViolatingSites extends Google_Service_Resource { /** - * Lists sites with Ad Experience Report statuses of "Failing" or "Warning". - * (violatingSites.listViolatingSites) + * Lists sites that are failing in the Ad Experience Report on at least one + * platform. (violatingSites.listViolatingSites) * * @param array $optParams Optional parameters. * @return Google_Service_AdExperienceReport_ViolatingSitesResponse diff --git a/vendor/google/apiclient-services/src/Google/Service/AlertCenter.php b/vendor/google/apiclient-services/src/Google/Service/AlertCenter.php index ce22528..081cdb8 100644 --- a/vendor/google/apiclient-services/src/Google/Service/AlertCenter.php +++ b/vendor/google/apiclient-services/src/Google/Service/AlertCenter.php @@ -59,7 +59,15 @@ class Google_Service_AlertCenter extends Google_Service 'alerts', array( 'methods' => array( - 'delete' => array( + 'batchDelete' => array( + 'path' => 'v1beta1/alerts:batchDelete', + 'httpMethod' => 'POST', + 'parameters' => array(), + ),'batchUndelete' => array( + 'path' => 'v1beta1/alerts:batchUndelete', + 'httpMethod' => 'POST', + 'parameters' => array(), + ),'delete' => array( 'path' => 'v1beta1/alerts/{alertId}', 'httpMethod' => 'DELETE', 'parameters' => array( @@ -87,14 +95,24 @@ class Google_Service_AlertCenter extends Google_Service 'type' => 'string', ), ), + ),'getMetadata' => array( + 'path' => 'v1beta1/alerts/{alertId}/metadata', + 'httpMethod' => 'GET', + 'parameters' => array( + 'alertId' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'customerId' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), ),'list' => array( 'path' => 'v1beta1/alerts', 'httpMethod' => 'GET', 'parameters' => array( - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -111,6 +129,10 @@ class Google_Service_AlertCenter extends Google_Service 'location' => 'query', 'type' => 'integer', ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'undelete' => array( 'path' => 'v1beta1/alerts/{alertId}:undelete', @@ -155,11 +177,11 @@ class Google_Service_AlertCenter extends Google_Service 'type' => 'string', 'required' => true, ), - 'filter' => array( + 'customerId' => array( 'location' => 'query', 'type' => 'string', ), - 'customerId' => array( + 'filter' => array( 'location' => 'query', 'type' => 'string', ), diff --git a/vendor/google/apiclient-services/src/Google/Service/AlertCenter/Alert.php b/vendor/google/apiclient-services/src/Google/Service/AlertCenter/Alert.php index 53c91e8..1c36080 100644 --- a/vendor/google/apiclient-services/src/Google/Service/AlertCenter/Alert.php +++ b/vendor/google/apiclient-services/src/Google/Service/AlertCenter/Alert.php @@ -23,6 +23,9 @@ class Google_Service_AlertCenter_Alert extends Google_Model public $data; public $deleted; public $endTime; + public $etag; + protected $metadataType = 'Google_Service_AlertCenter_AlertMetadata'; + protected $metadataDataType = ''; public $securityInvestigationToolLink; public $source; public $startTime; @@ -77,6 +80,28 @@ class Google_Service_AlertCenter_Alert extends Google_Model { return $this->endTime; } + public function setEtag($etag) + { + $this->etag = $etag; + } + public function getEtag() + { + return $this->etag; + } + /** + * @param Google_Service_AlertCenter_AlertMetadata + */ + public function setMetadata(Google_Service_AlertCenter_AlertMetadata $metadata) + { + $this->metadata = $metadata; + } + /** + * @return Google_Service_AlertCenter_AlertMetadata + */ + public function getMetadata() + { + return $this->metadata; + } public function setSecurityInvestigationToolLink($securityInvestigationToolLink) { $this->securityInvestigationToolLink = $securityInvestigationToolLink; diff --git a/vendor/google/apiclient-services/src/Google/Service/AlertCenter/AlertMetadata.php b/vendor/google/apiclient-services/src/Google/Service/AlertCenter/AlertMetadata.php new file mode 100644 index 0000000..0e4448d --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/AlertCenter/AlertMetadata.php @@ -0,0 +1,84 @@ +alertId = $alertId; + } + public function getAlertId() + { + return $this->alertId; + } + public function setAssignee($assignee) + { + $this->assignee = $assignee; + } + public function getAssignee() + { + return $this->assignee; + } + public function setCustomerId($customerId) + { + $this->customerId = $customerId; + } + public function getCustomerId() + { + return $this->customerId; + } + public function setEtag($etag) + { + $this->etag = $etag; + } + public function getEtag() + { + return $this->etag; + } + public function setSeverity($severity) + { + $this->severity = $severity; + } + public function getSeverity() + { + return $this->severity; + } + public function setStatus($status) + { + $this->status = $status; + } + public function getStatus() + { + return $this->status; + } + public function setUpdateTime($updateTime) + { + $this->updateTime = $updateTime; + } + public function getUpdateTime() + { + return $this->updateTime; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/AlertCenter/AppMakerSqlSetupNotification.php b/vendor/google/apiclient-services/src/Google/Service/AlertCenter/AppMakerSqlSetupNotification.php new file mode 100644 index 0000000..4a2c3a0 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/AlertCenter/AppMakerSqlSetupNotification.php @@ -0,0 +1,38 @@ +requestInfo = $requestInfo; + } + /** + * @return Google_Service_AlertCenter_RequestInfo + */ + public function getRequestInfo() + { + return $this->requestInfo; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/AlertCenter/BatchDeleteAlertsRequest.php b/vendor/google/apiclient-services/src/Google/Service/AlertCenter/BatchDeleteAlertsRequest.php new file mode 100644 index 0000000..b17656e --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/AlertCenter/BatchDeleteAlertsRequest.php @@ -0,0 +1,40 @@ +alertId = $alertId; + } + public function getAlertId() + { + return $this->alertId; + } + public function setCustomerId($customerId) + { + $this->customerId = $customerId; + } + public function getCustomerId() + { + return $this->customerId; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/AlertCenter/BatchDeleteAlertsResponse.php b/vendor/google/apiclient-services/src/Google/Service/AlertCenter/BatchDeleteAlertsResponse.php new file mode 100644 index 0000000..647d28f --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/AlertCenter/BatchDeleteAlertsResponse.php @@ -0,0 +1,47 @@ +failedAlertStatus = $failedAlertStatus; + } + /** + * @return Google_Service_AlertCenter_Status + */ + public function getFailedAlertStatus() + { + return $this->failedAlertStatus; + } + public function setSuccessAlertIds($successAlertIds) + { + $this->successAlertIds = $successAlertIds; + } + public function getSuccessAlertIds() + { + return $this->successAlertIds; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/AlertCenter/BatchUndeleteAlertsRequest.php b/vendor/google/apiclient-services/src/Google/Service/AlertCenter/BatchUndeleteAlertsRequest.php new file mode 100644 index 0000000..0c5ce2f --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/AlertCenter/BatchUndeleteAlertsRequest.php @@ -0,0 +1,40 @@ +alertId = $alertId; + } + public function getAlertId() + { + return $this->alertId; + } + public function setCustomerId($customerId) + { + $this->customerId = $customerId; + } + public function getCustomerId() + { + return $this->customerId; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/AlertCenter/BatchUndeleteAlertsResponse.php b/vendor/google/apiclient-services/src/Google/Service/AlertCenter/BatchUndeleteAlertsResponse.php new file mode 100644 index 0000000..4c0f0fb --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/AlertCenter/BatchUndeleteAlertsResponse.php @@ -0,0 +1,47 @@ +failedAlertStatus = $failedAlertStatus; + } + /** + * @return Google_Service_AlertCenter_Status + */ + public function getFailedAlertStatus() + { + return $this->failedAlertStatus; + } + public function setSuccessAlertIds($successAlertIds) + { + $this->successAlertIds = $successAlertIds; + } + public function getSuccessAlertIds() + { + return $this->successAlertIds; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/AlertCenter/RequestInfo.php b/vendor/google/apiclient-services/src/Google/Service/AlertCenter/RequestInfo.php new file mode 100644 index 0000000..f00b933 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/AlertCenter/RequestInfo.php @@ -0,0 +1,49 @@ +appDeveloperEmail = $appDeveloperEmail; + } + public function getAppDeveloperEmail() + { + return $this->appDeveloperEmail; + } + public function setAppKey($appKey) + { + $this->appKey = $appKey; + } + public function getAppKey() + { + return $this->appKey; + } + public function setNumberOfRequests($numberOfRequests) + { + $this->numberOfRequests = $numberOfRequests; + } + public function getNumberOfRequests() + { + return $this->numberOfRequests; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/AlertCenter/Resource/Alerts.php b/vendor/google/apiclient-services/src/Google/Service/AlertCenter/Resource/Alerts.php index c54a5ec..13223b0 100644 --- a/vendor/google/apiclient-services/src/Google/Service/AlertCenter/Resource/Alerts.php +++ b/vendor/google/apiclient-services/src/Google/Service/AlertCenter/Resource/Alerts.php @@ -25,6 +25,32 @@ */ class Google_Service_AlertCenter_Resource_Alerts extends Google_Service_Resource { + /** + * Performs batch delete operation on alerts. (alerts.batchDelete) + * + * @param Google_Service_AlertCenter_BatchDeleteAlertsRequest $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_AlertCenter_BatchDeleteAlertsResponse + */ + public function batchDelete(Google_Service_AlertCenter_BatchDeleteAlertsRequest $postBody, $optParams = array()) + { + $params = array('postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('batchDelete', array($params), "Google_Service_AlertCenter_BatchDeleteAlertsResponse"); + } + /** + * Performs batch undelete operation on alerts. (alerts.batchUndelete) + * + * @param Google_Service_AlertCenter_BatchUndeleteAlertsRequest $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_AlertCenter_BatchUndeleteAlertsResponse + */ + public function batchUndelete(Google_Service_AlertCenter_BatchUndeleteAlertsRequest $postBody, $optParams = array()) + { + $params = array('postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('batchUndelete', array($params), "Google_Service_AlertCenter_BatchUndeleteAlertsResponse"); + } /** * Marks the specified alert for deletion. An alert that has been marked for * deletion is removed from Alert Center after 30 days. Marking an alert for @@ -64,15 +90,30 @@ class Google_Service_AlertCenter_Resource_Alerts extends Google_Service_Resource $params = array_merge($params, $optParams); return $this->call('get', array($params), "Google_Service_AlertCenter_Alert"); } + /** + * Returns the metadata of an alert. Attempting to get metadata for a non- + * existent alert returns `NOT_FOUND` error. (alerts.getMetadata) + * + * @param string $alertId Required. The identifier of the alert this metadata + * belongs to. + * @param array $optParams Optional parameters. + * + * @opt_param string customerId Optional. The unique identifier of the G Suite + * organization account of the customer the alert metadata is associated with. + * Inferred from the caller identity if not provided. + * @return Google_Service_AlertCenter_AlertMetadata + */ + public function getMetadata($alertId, $optParams = array()) + { + $params = array('alertId' => $alertId); + $params = array_merge($params, $optParams); + return $this->call('getMetadata', array($params), "Google_Service_AlertCenter_AlertMetadata"); + } /** * Lists the alerts. (alerts.listAlerts) * * @param array $optParams Optional parameters. * - * @opt_param string filter Optional. A query string for filtering alert - * results. For more details, see [Query filters](/admin-sdk/alertcenter/guides - * /query-filters) and [Supported query filter fields](/admin- - * sdk/alertcenter/reference/filter-fields#alerts.list). * @opt_param string pageToken Optional. A token identifying a page of results * the server should return. If empty, a new iteration is started. To continue * an iteration, pass in the value from the previous ListAlertsResponse's @@ -88,6 +129,10 @@ class Google_Service_AlertCenter_Resource_Alerts extends Google_Service_Resource * @opt_param int pageSize Optional. The requested page size. Server may return * fewer items than requested. If unspecified, server picks an appropriate * default. + * @opt_param string filter Optional. A query string for filtering alert + * results. For more details, see [Query filters](/admin-sdk/alertcenter/guides + * /query-filters) and [Supported query filter fields](/admin- + * sdk/alertcenter/reference/filter-fields#alerts.list). * @return Google_Service_AlertCenter_ListAlertsResponse */ public function listAlerts($optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/AlertCenter/Resource/AlertsFeedback.php b/vendor/google/apiclient-services/src/Google/Service/AlertCenter/Resource/AlertsFeedback.php index 91d7cdf..1677ea4 100644 --- a/vendor/google/apiclient-services/src/Google/Service/AlertCenter/Resource/AlertsFeedback.php +++ b/vendor/google/apiclient-services/src/Google/Service/AlertCenter/Resource/AlertsFeedback.php @@ -27,7 +27,9 @@ class Google_Service_AlertCenter_Resource_AlertsFeedback extends Google_Service_ { /** * Creates new feedback for an alert. Attempting to create a feedback for a non- - * existent alert returns `NOT_FOUND` error. (feedback.create) + * existent alert returns `NOT_FOUND` error. Attempting to create a feedback for + * an alert that is marked for deletion returns `FAILED_PRECONDITION' error. + * (feedback.create) * * @param string $alertId Required. The identifier of the alert this feedback * belongs to. @@ -53,13 +55,13 @@ class Google_Service_AlertCenter_Resource_AlertsFeedback extends Google_Service_ * be used to represent all alerts. * @param array $optParams Optional parameters. * + * @opt_param string customerId Optional. The unique identifier of the G Suite + * organization account of the customer the alert feedback are associated with. + * Inferred from the caller identity if not provided. * @opt_param string filter Optional. A query string for filtering alert * feedback results. For more details, see [Query filters](/admin- * sdk/alertcenter/guides/query-filters) and [Supported query filter fields * ](/admin-sdk/alertcenter/reference/filter-fields#alerts.feedback.list). - * @opt_param string customerId Optional. The unique identifier of the G Suite - * organization account of the customer the alert feedback are associated with. - * Inferred from the caller identity if not provided. * @return Google_Service_AlertCenter_ListAlertFeedbackResponse */ public function listAlertsFeedback($alertId, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/SensitiveTextAnnotation.php b/vendor/google/apiclient-services/src/Google/Service/AlertCenter/Status.php similarity index 63% rename from vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/SensitiveTextAnnotation.php rename to vendor/google/apiclient-services/src/Google/Service/AlertCenter/Status.php index 881b3eb..07c7fd7 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/SensitiveTextAnnotation.php +++ b/vendor/google/apiclient-services/src/Google/Service/AlertCenter/Status.php @@ -15,23 +15,35 @@ * the License. */ -class Google_Service_CloudHealthcare_SensitiveTextAnnotation extends Google_Model +class Google_Service_AlertCenter_Status extends Google_Collection { - protected $detailsType = 'Google_Service_CloudHealthcare_Detail'; - protected $detailsDataType = 'map'; + protected $collection_key = 'details'; + public $code; + public $details; + public $message; - /** - * @param Google_Service_CloudHealthcare_Detail - */ + public function setCode($code) + { + $this->code = $code; + } + public function getCode() + { + return $this->code; + } public function setDetails($details) { $this->details = $details; } - /** - * @return Google_Service_CloudHealthcare_Detail - */ public function getDetails() { return $this->details; } + public function setMessage($message) + { + $this->message = $message; + } + public function getMessage() + { + return $this->message; + } } diff --git a/vendor/google/apiclient-services/src/Google/Service/AndroidEnterprise/ManagedConfigurationsSettings.php b/vendor/google/apiclient-services/src/Google/Service/AndroidEnterprise/ManagedConfigurationsSettings.php index 345bd56..5556211 100644 --- a/vendor/google/apiclient-services/src/Google/Service/AndroidEnterprise/ManagedConfigurationsSettings.php +++ b/vendor/google/apiclient-services/src/Google/Service/AndroidEnterprise/ManagedConfigurationsSettings.php @@ -15,13 +15,10 @@ * the License. */ -class Google_Service_AndroidEnterprise_ManagedConfigurationsSettings extends Google_Collection +class Google_Service_AndroidEnterprise_ManagedConfigurationsSettings extends Google_Model { - protected $collection_key = 'managedProperty'; public $kind; public $lastUpdatedTimestampMillis; - protected $managedPropertyType = 'Google_Service_AndroidEnterprise_ManagedProperty'; - protected $managedPropertyDataType = 'array'; public $mcmId; public $name; @@ -41,20 +38,6 @@ class Google_Service_AndroidEnterprise_ManagedConfigurationsSettings extends Goo { return $this->lastUpdatedTimestampMillis; } - /** - * @param Google_Service_AndroidEnterprise_ManagedProperty - */ - public function setManagedProperty($managedProperty) - { - $this->managedProperty = $managedProperty; - } - /** - * @return Google_Service_AndroidEnterprise_ManagedProperty - */ - public function getManagedProperty() - { - return $this->managedProperty; - } public function setMcmId($mcmId) { $this->mcmId = $mcmId; diff --git a/vendor/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Managedconfigurationssettings.php b/vendor/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Managedconfigurationssettings.php index c365aff..4bba391 100644 --- a/vendor/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Managedconfigurationssettings.php +++ b/vendor/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Managedconfigurationssettings.php @@ -26,8 +26,7 @@ class Google_Service_AndroidEnterprise_Resource_Managedconfigurationssettings extends Google_Service_Resource { /** - * Lists all the managed configurations settings for the specified app. Only the - * ID and the name is set. + * Lists all the managed configurations settings for the specified app. * (managedconfigurationssettings.listManagedconfigurationssettings) * * @param string $enterpriseId The ID of the enterprise. diff --git a/vendor/google/apiclient-services/src/Google/Service/AndroidManagement.php b/vendor/google/apiclient-services/src/Google/Service/AndroidManagement.php index 7e89a8d..1a2d414 100644 --- a/vendor/google/apiclient-services/src/Google/Service/AndroidManagement.php +++ b/vendor/google/apiclient-services/src/Google/Service/AndroidManagement.php @@ -70,6 +70,10 @@ class Google_Service_AndroidManagement extends Google_Service 'path' => 'v1/enterprises', 'httpMethod' => 'POST', 'parameters' => array( + 'enterpriseToken' => array( + 'location' => 'query', + 'type' => 'string', + ), 'signupUrlName' => array( 'location' => 'query', 'type' => 'string', @@ -78,10 +82,6 @@ class Google_Service_AndroidManagement extends Google_Service 'location' => 'query', 'type' => 'string', ), - 'enterpriseToken' => array( - 'location' => 'query', - 'type' => 'string', - ), ), ),'get' => array( 'path' => 'v1/{+name}', @@ -257,10 +257,6 @@ class Google_Service_AndroidManagement extends Google_Service 'type' => 'string', 'required' => true, ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -269,6 +265,10 @@ class Google_Service_AndroidManagement extends Google_Service 'location' => 'query', 'type' => 'integer', ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ), ) @@ -468,11 +468,11 @@ class Google_Service_AndroidManagement extends Google_Service 'path' => 'v1/signupUrls', 'httpMethod' => 'POST', 'parameters' => array( - 'projectId' => array( + 'callbackUrl' => array( 'location' => 'query', 'type' => 'string', ), - 'callbackUrl' => array( + 'projectId' => array( 'location' => 'query', 'type' => 'string', ), diff --git a/vendor/google/apiclient-services/src/Google/Service/AndroidManagement/AppTrackInfo.php b/vendor/google/apiclient-services/src/Google/Service/AndroidManagement/AppTrackInfo.php new file mode 100644 index 0000000..762c710 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/AndroidManagement/AppTrackInfo.php @@ -0,0 +1,39 @@ +trackAlias = $trackAlias; + } + public function getTrackAlias() + { + return $this->trackAlias; + } + public function setTrackId($trackId) + { + $this->trackId = $trackId; + } + public function getTrackId() + { + return $this->trackId; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/AndroidManagement/Application.php b/vendor/google/apiclient-services/src/Google/Service/AndroidManagement/Application.php index c3e0f7c..99a6019 100644 --- a/vendor/google/apiclient-services/src/Google/Service/AndroidManagement/Application.php +++ b/vendor/google/apiclient-services/src/Google/Service/AndroidManagement/Application.php @@ -18,6 +18,8 @@ class Google_Service_AndroidManagement_Application extends Google_Collection { protected $collection_key = 'permissions'; + protected $appTracksType = 'Google_Service_AndroidManagement_AppTrackInfo'; + protected $appTracksDataType = 'array'; protected $managedPropertiesType = 'Google_Service_AndroidManagement_ManagedProperty'; protected $managedPropertiesDataType = 'array'; public $name; @@ -25,6 +27,20 @@ class Google_Service_AndroidManagement_Application extends Google_Collection protected $permissionsDataType = 'array'; public $title; + /** + * @param Google_Service_AndroidManagement_AppTrackInfo + */ + public function setAppTracks($appTracks) + { + $this->appTracks = $appTracks; + } + /** + * @return Google_Service_AndroidManagement_AppTrackInfo + */ + public function getAppTracks() + { + return $this->appTracks; + } /** * @param Google_Service_AndroidManagement_ManagedProperty */ diff --git a/vendor/google/apiclient-services/src/Google/Service/AndroidManagement/ApplicationPolicy.php b/vendor/google/apiclient-services/src/Google/Service/AndroidManagement/ApplicationPolicy.php index ccc4050..04519f2 100644 --- a/vendor/google/apiclient-services/src/Google/Service/AndroidManagement/ApplicationPolicy.php +++ b/vendor/google/apiclient-services/src/Google/Service/AndroidManagement/ApplicationPolicy.php @@ -18,6 +18,7 @@ class Google_Service_AndroidManagement_ApplicationPolicy extends Google_Collection { protected $collection_key = 'permissionGrants'; + public $accessibleTrackIds; public $defaultPermissionPolicy; public $delegatedScopes; public $disabled; @@ -31,6 +32,14 @@ class Google_Service_AndroidManagement_ApplicationPolicy extends Google_Collecti protected $permissionGrantsType = 'Google_Service_AndroidManagement_PermissionGrant'; protected $permissionGrantsDataType = 'array'; + public function setAccessibleTrackIds($accessibleTrackIds) + { + $this->accessibleTrackIds = $accessibleTrackIds; + } + public function getAccessibleTrackIds() + { + return $this->accessibleTrackIds; + } public function setDefaultPermissionPolicy($defaultPermissionPolicy) { $this->defaultPermissionPolicy = $defaultPermissionPolicy; diff --git a/vendor/google/apiclient-services/src/Google/Service/AndroidManagement/Policy.php b/vendor/google/apiclient-services/src/Google/Service/AndroidManagement/Policy.php index 949a0e3..57f2d66 100644 --- a/vendor/google/apiclient-services/src/Google/Service/AndroidManagement/Policy.php +++ b/vendor/google/apiclient-services/src/Google/Service/AndroidManagement/Policy.php @@ -75,6 +75,8 @@ class Google_Service_AndroidManagement_Policy extends Google_Collection protected $passwordRequirementsDataType = ''; protected $permissionGrantsType = 'Google_Service_AndroidManagement_PermissionGrant'; protected $permissionGrantsDataType = 'array'; + protected $permittedAccessibilityServicesType = 'Google_Service_AndroidManagement_PackageNameList'; + protected $permittedAccessibilityServicesDataType = ''; protected $permittedInputMethodsType = 'Google_Service_AndroidManagement_PackageNameList'; protected $permittedInputMethodsDataType = ''; protected $persistentPreferredActivitiesType = 'Google_Service_AndroidManagement_PersistentPreferredActivity'; @@ -551,6 +553,20 @@ class Google_Service_AndroidManagement_Policy extends Google_Collection { return $this->permissionGrants; } + /** + * @param Google_Service_AndroidManagement_PackageNameList + */ + public function setPermittedAccessibilityServices(Google_Service_AndroidManagement_PackageNameList $permittedAccessibilityServices) + { + $this->permittedAccessibilityServices = $permittedAccessibilityServices; + } + /** + * @return Google_Service_AndroidManagement_PackageNameList + */ + public function getPermittedAccessibilityServices() + { + return $this->permittedAccessibilityServices; + } /** * @param Google_Service_AndroidManagement_PackageNameList */ diff --git a/vendor/google/apiclient-services/src/Google/Service/AndroidManagement/Resource/Enterprises.php b/vendor/google/apiclient-services/src/Google/Service/AndroidManagement/Resource/Enterprises.php index a243b5f..43eae6a 100644 --- a/vendor/google/apiclient-services/src/Google/Service/AndroidManagement/Resource/Enterprises.php +++ b/vendor/google/apiclient-services/src/Google/Service/AndroidManagement/Resource/Enterprises.php @@ -32,12 +32,12 @@ class Google_Service_AndroidManagement_Resource_Enterprises extends Google_Servi * @param Google_Service_AndroidManagement_Enterprise $postBody * @param array $optParams Optional parameters. * + * @opt_param string enterpriseToken The enterprise token appended to the + * callback URL. * @opt_param string signupUrlName The name of the SignupUrl used to sign up for * the enterprise. * @opt_param string projectId The ID of the Google Cloud Platform project which * will own the enterprise. - * @opt_param string enterpriseToken The enterprise token appended to the - * callback URL. * @return Google_Service_AndroidManagement_Enterprise */ public function create(Google_Service_AndroidManagement_Enterprise $postBody, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/AndroidManagement/Resource/EnterprisesDevicesOperations.php b/vendor/google/apiclient-services/src/Google/Service/AndroidManagement/Resource/EnterprisesDevicesOperations.php index 770299d..ac298bf 100644 --- a/vendor/google/apiclient-services/src/Google/Service/AndroidManagement/Resource/EnterprisesDevicesOperations.php +++ b/vendor/google/apiclient-services/src/Google/Service/AndroidManagement/Resource/EnterprisesDevicesOperations.php @@ -91,9 +91,9 @@ class Google_Service_AndroidManagement_Resource_EnterprisesDevicesOperations ext * @param string $name The name of the operation's parent resource. * @param array $optParams Optional parameters. * - * @opt_param string filter The standard list filter. * @opt_param string pageToken The standard list page token. * @opt_param int pageSize The standard list page size. + * @opt_param string filter The standard list filter. * @return Google_Service_AndroidManagement_ListOperationsResponse */ public function listEnterprisesDevicesOperations($name, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/AndroidManagement/Resource/SignupUrls.php b/vendor/google/apiclient-services/src/Google/Service/AndroidManagement/Resource/SignupUrls.php index de930d0..4067c54 100644 --- a/vendor/google/apiclient-services/src/Google/Service/AndroidManagement/Resource/SignupUrls.php +++ b/vendor/google/apiclient-services/src/Google/Service/AndroidManagement/Resource/SignupUrls.php @@ -30,14 +30,14 @@ class Google_Service_AndroidManagement_Resource_SignupUrls extends Google_Servic * * @param array $optParams Optional parameters. * - * @opt_param string projectId The ID of the Google Cloud Platform project which - * will own the enterprise. * @opt_param string callbackUrl The callback URL that the admin will be * redirected to after successfully creating an enterprise. Before redirecting * there the system will add a query parameter to this URL named enterpriseToken * which will contain an opaque token to be used for the create enterprise * request. The URL will be parsed then reformatted in order to add the * enterpriseToken parameter, so there may be some minor formatting changes. + * @opt_param string projectId The ID of the Google Cloud Platform project which + * will own the enterprise. * @return Google_Service_AndroidManagement_SignupUrl */ public function create($optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/AndroidManagement/WebToken.php b/vendor/google/apiclient-services/src/Google/Service/AndroidManagement/WebToken.php index c4ce371..fed3b6d 100644 --- a/vendor/google/apiclient-services/src/Google/Service/AndroidManagement/WebToken.php +++ b/vendor/google/apiclient-services/src/Google/Service/AndroidManagement/WebToken.php @@ -18,11 +18,20 @@ class Google_Service_AndroidManagement_WebToken extends Google_Collection { protected $collection_key = 'permissions'; + public $enabledFeatures; public $name; public $parentFrameUrl; public $permissions; public $value; + public function setEnabledFeatures($enabledFeatures) + { + $this->enabledFeatures = $enabledFeatures; + } + public function getEnabledFeatures() + { + return $this->enabledFeatures; + } public function setName($name) { $this->name = $name; diff --git a/vendor/google/apiclient-services/src/Google/Service/AndroidPublisher.php b/vendor/google/apiclient-services/src/Google/Service/AndroidPublisher.php index 3b54313..796a2db 100644 --- a/vendor/google/apiclient-services/src/Google/Service/AndroidPublisher.php +++ b/vendor/google/apiclient-services/src/Google/Service/AndroidPublisher.php @@ -1224,6 +1224,10 @@ class Google_Service_AndroidPublisher extends Google_Service 'location' => 'query', 'type' => 'string', ), + 'type' => array( + 'location' => 'query', + 'type' => 'integer', + ), ), ), ) diff --git a/vendor/google/apiclient-services/src/Google/Service/AndroidPublisher/ProductPurchase.php b/vendor/google/apiclient-services/src/Google/Service/AndroidPublisher/ProductPurchase.php index f99f7f9..d8eafa5 100644 --- a/vendor/google/apiclient-services/src/Google/Service/AndroidPublisher/ProductPurchase.php +++ b/vendor/google/apiclient-services/src/Google/Service/AndroidPublisher/ProductPurchase.php @@ -24,6 +24,7 @@ class Google_Service_AndroidPublisher_ProductPurchase extends Google_Model public $orderId; public $purchaseState; public $purchaseTimeMillis; + public $purchaseToken; public $purchaseType; public function setAcknowledgementState($acknowledgementState) @@ -82,6 +83,14 @@ class Google_Service_AndroidPublisher_ProductPurchase extends Google_Model { return $this->purchaseTimeMillis; } + public function setPurchaseToken($purchaseToken) + { + $this->purchaseToken = $purchaseToken; + } + public function getPurchaseToken() + { + return $this->purchaseToken; + } public function setPurchaseType($purchaseType) { $this->purchaseType = $purchaseType; diff --git a/vendor/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/PurchasesVoidedpurchases.php b/vendor/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/PurchasesVoidedpurchases.php index c9c9661..f5ff77d 100644 --- a/vendor/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/PurchasesVoidedpurchases.php +++ b/vendor/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/PurchasesVoidedpurchases.php @@ -34,20 +34,29 @@ class Google_Service_AndroidPublisher_Resource_PurchasesVoidedpurchases extends * @param array $optParams Optional parameters. * * @opt_param string endTime The time, in milliseconds since the Epoch, of the - * newest voided in-app product purchase that you want to see in the response. - * The value of this parameter cannot be greater than the current time and is - * ignored if a pagination token is set. Default value is current time. Note: - * This filter is applied on the time at which the record is seen as voided by - * our systems and not the actual voided time returned in the response. + * newest voided purchase that you want to see in the response. The value of + * this parameter cannot be greater than the current time and is ignored if a + * pagination token is set. Default value is current time. Note: This filter is + * applied on the time at which the record is seen as voided by our systems and + * not the actual voided time returned in the response. * @opt_param string maxResults * @opt_param string startIndex * @opt_param string startTime The time, in milliseconds since the Epoch, of the - * oldest voided in-app product purchase that you want to see in the response. - * The value of this parameter cannot be older than 30 days and is ignored if a - * pagination token is set. Default value is current time minus 30 days. Note: - * This filter is applied on the time at which the record is seen as voided by - * our systems and not the actual voided time returned in the response. + * oldest voided purchase that you want to see in the response. The value of + * this parameter cannot be older than 30 days and is ignored if a pagination + * token is set. Default value is current time minus 30 days. Note: This filter + * is applied on the time at which the record is seen as voided by our systems + * and not the actual voided time returned in the response. * @opt_param string token + * @opt_param int type The type of voided purchases that you want to see in the + * response. Possible values are: - 0: Only voided in-app product purchases will + * be returned in the response. This is the default value. - 1: Both voided in- + * app purchases and voided subscription purchases will be returned in the + * response. Note: Before requesting to receive voided subscription purchases, + * you must switch to use orderId in the response which uniquely identifies one- + * time purchases and subscriptions. Otherwise, you will receive multiple + * subscription orders with the same PurchaseToken, because subscription renewal + * orders share the same PurchaseToken. * @return Google_Service_AndroidPublisher_VoidedPurchasesListResponse */ public function listPurchasesVoidedpurchases($packageName, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/AndroidPublisher/Testers.php b/vendor/google/apiclient-services/src/Google/Service/AndroidPublisher/Testers.php index 39e9847..4de42c8 100644 --- a/vendor/google/apiclient-services/src/Google/Service/AndroidPublisher/Testers.php +++ b/vendor/google/apiclient-services/src/Google/Service/AndroidPublisher/Testers.php @@ -17,9 +17,8 @@ class Google_Service_AndroidPublisher_Testers extends Google_Collection { - protected $collection_key = 'googlePlusCommunities'; + protected $collection_key = 'googleGroups'; public $googleGroups; - public $googlePlusCommunities; public function setGoogleGroups($googleGroups) { @@ -29,12 +28,4 @@ class Google_Service_AndroidPublisher_Testers extends Google_Collection { return $this->googleGroups; } - public function setGooglePlusCommunities($googlePlusCommunities) - { - $this->googlePlusCommunities = $googlePlusCommunities; - } - public function getGooglePlusCommunities() - { - return $this->googlePlusCommunities; - } } diff --git a/vendor/google/apiclient-services/src/Google/Service/AndroidPublisher/VoidedPurchase.php b/vendor/google/apiclient-services/src/Google/Service/AndroidPublisher/VoidedPurchase.php index 754f8a0..35bc51b 100644 --- a/vendor/google/apiclient-services/src/Google/Service/AndroidPublisher/VoidedPurchase.php +++ b/vendor/google/apiclient-services/src/Google/Service/AndroidPublisher/VoidedPurchase.php @@ -18,8 +18,11 @@ class Google_Service_AndroidPublisher_VoidedPurchase extends Google_Model { public $kind; + public $orderId; public $purchaseTimeMillis; public $purchaseToken; + public $voidedReason; + public $voidedSource; public $voidedTimeMillis; public function setKind($kind) @@ -30,6 +33,14 @@ class Google_Service_AndroidPublisher_VoidedPurchase extends Google_Model { return $this->kind; } + public function setOrderId($orderId) + { + $this->orderId = $orderId; + } + public function getOrderId() + { + return $this->orderId; + } public function setPurchaseTimeMillis($purchaseTimeMillis) { $this->purchaseTimeMillis = $purchaseTimeMillis; @@ -46,6 +57,22 @@ class Google_Service_AndroidPublisher_VoidedPurchase extends Google_Model { return $this->purchaseToken; } + public function setVoidedReason($voidedReason) + { + $this->voidedReason = $voidedReason; + } + public function getVoidedReason() + { + return $this->voidedReason; + } + public function setVoidedSource($voidedSource) + { + $this->voidedSource = $voidedSource; + } + public function getVoidedSource() + { + return $this->voidedSource; + } public function setVoidedTimeMillis($voidedTimeMillis) { $this->voidedTimeMillis = $voidedTimeMillis; diff --git a/vendor/google/apiclient-services/src/Google/Service/Appengine.php b/vendor/google/apiclient-services/src/Google/Service/Appengine.php index f0f1efa..ff981c6 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Appengine.php +++ b/vendor/google/apiclient-services/src/Google/Service/Appengine.php @@ -173,6 +173,10 @@ class Google_Service_Appengine extends Google_Service 'type' => 'string', 'required' => true, ), + 'view' => array( + 'location' => 'query', + 'type' => 'string', + ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -181,10 +185,6 @@ class Google_Service_Appengine extends Google_Service 'location' => 'query', 'type' => 'integer', ), - 'view' => array( - 'location' => 'query', - 'type' => 'string', - ), ), ),'patch' => array( 'path' => 'v1/apps/{appsId}/authorizedCertificates/{authorizedCertificatesId}', @@ -393,10 +393,6 @@ class Google_Service_Appengine extends Google_Service 'type' => 'string', 'required' => true, ), - 'pageToken' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageSize' => array( 'location' => 'query', 'type' => 'integer', @@ -405,6 +401,10 @@ class Google_Service_Appengine extends Google_Service 'location' => 'query', 'type' => 'string', ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'patch' => array( 'path' => 'v1/apps/{appsId}/firewall/ingressRules/{ingressRulesId}', @@ -459,6 +459,10 @@ class Google_Service_Appengine extends Google_Service 'type' => 'string', 'required' => true, ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -467,10 +471,6 @@ class Google_Service_Appengine extends Google_Service 'location' => 'query', 'type' => 'integer', ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), ), ), ) @@ -506,10 +506,6 @@ class Google_Service_Appengine extends Google_Service 'type' => 'string', 'required' => true, ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -518,6 +514,10 @@ class Google_Service_Appengine extends Google_Service 'location' => 'query', 'type' => 'integer', ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ), ) @@ -568,14 +568,14 @@ class Google_Service_Appengine extends Google_Service 'type' => 'string', 'required' => true, ), - 'pageToken' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageSize' => array( 'location' => 'query', 'type' => 'integer', ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'patch' => array( 'path' => 'v1/apps/{appsId}/services/{servicesId}', @@ -683,6 +683,10 @@ class Google_Service_Appengine extends Google_Service 'type' => 'string', 'required' => true, ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), 'pageSize' => array( 'location' => 'query', 'type' => 'integer', @@ -691,10 +695,6 @@ class Google_Service_Appengine extends Google_Service 'location' => 'query', 'type' => 'string', ), - 'pageToken' => array( - 'location' => 'query', - 'type' => 'string', - ), ), ),'patch' => array( 'path' => 'v1/apps/{appsId}/services/{servicesId}/versions/{versionsId}', diff --git a/vendor/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsAuthorizedCertificates.php b/vendor/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsAuthorizedCertificates.php index 41bca62..db27a88 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsAuthorizedCertificates.php +++ b/vendor/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsAuthorizedCertificates.php @@ -83,11 +83,11 @@ class Google_Service_Appengine_Resource_AppsAuthorizedCertificates extends Googl * resource. Example: apps/myapp. * @param array $optParams Optional parameters. * + * @opt_param string view Controls the set of fields returned in the LIST + * response. * @opt_param string pageToken Continuation token for fetching the next page of * results. * @opt_param int pageSize Maximum results to return per page. - * @opt_param string view Controls the set of fields returned in the LIST - * response. * @return Google_Service_Appengine_ListAuthorizedCertificatesResponse */ public function listAppsAuthorizedCertificates($appsId, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsFirewallIngressRules.php b/vendor/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsFirewallIngressRules.php index 4ab5823..dc76e67 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsFirewallIngressRules.php +++ b/vendor/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsFirewallIngressRules.php @@ -98,12 +98,12 @@ class Google_Service_Appengine_Resource_AppsFirewallIngressRules extends Google_ * retrieve. Example: apps/myapp/firewall/ingressRules. * @param array $optParams Optional parameters. * - * @opt_param string pageToken Continuation token for fetching the next page of - * results. * @opt_param int pageSize Maximum results to return per page. * @opt_param string matchingAddress A valid IP Address. If set, only rules * matching this address will be returned. The first returned rule will be the * rule that fires on requests from this IP. + * @opt_param string pageToken Continuation token for fetching the next page of + * results. * @return Google_Service_Appengine_ListIngressRulesResponse */ public function listAppsFirewallIngressRules($appsId, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsLocations.php b/vendor/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsLocations.php index 0efdc1c..a94d912 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsLocations.php +++ b/vendor/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsLocations.php @@ -47,9 +47,9 @@ class Google_Service_Appengine_Resource_AppsLocations extends Google_Service_Res * collection, if applicable. * @param array $optParams Optional parameters. * + * @opt_param string filter The standard list filter. * @opt_param string pageToken The standard list page token. * @opt_param int pageSize The standard list page size. - * @opt_param string filter The standard list filter. * @return Google_Service_Appengine_ListLocationsResponse */ public function listAppsLocations($appsId, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsOperations.php b/vendor/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsOperations.php index 25f19a4..9bad0f3 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsOperations.php +++ b/vendor/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsOperations.php @@ -56,9 +56,9 @@ class Google_Service_Appengine_Resource_AppsOperations extends Google_Service_Re * resource. * @param array $optParams Optional parameters. * - * @opt_param string filter The standard list filter. * @opt_param string pageToken The standard list page token. * @opt_param int pageSize The standard list page size. + * @opt_param string filter The standard list filter. * @return Google_Service_Appengine_ListOperationsResponse */ public function listAppsOperations($appsId, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsServices.php b/vendor/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsServices.php index 8758ca6..9c82b39 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsServices.php +++ b/vendor/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsServices.php @@ -62,9 +62,9 @@ class Google_Service_Appengine_Resource_AppsServices extends Google_Service_Reso * resource. Example: apps/myapp. * @param array $optParams Optional parameters. * + * @opt_param int pageSize Maximum results to return per page. * @opt_param string pageToken Continuation token for fetching the next page of * results. - * @opt_param int pageSize Maximum results to return per page. * @return Google_Service_Appengine_ListServicesResponse */ public function listAppsServices($appsId, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsServicesVersions.php b/vendor/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsServicesVersions.php index 360185b..8bcee9e 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsServicesVersions.php +++ b/vendor/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsServicesVersions.php @@ -86,11 +86,11 @@ class Google_Service_Appengine_Resource_AppsServicesVersions extends Google_Serv * @param string $servicesId Part of `parent`. See documentation of `appsId`. * @param array $optParams Optional parameters. * + * @opt_param string pageToken Continuation token for fetching the next page of + * results. * @opt_param int pageSize Maximum results to return per page. * @opt_param string view Controls the set of fields returned in the List * response. - * @opt_param string pageToken Continuation token for fetching the next page of - * results. * @return Google_Service_Appengine_ListVersionsResponse */ public function listAppsServicesVersions($appsId, $servicesId, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsServicesVersionsInstances.php b/vendor/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsServicesVersionsInstances.php index 6147fed..08fe459 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsServicesVersionsInstances.php +++ b/vendor/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsServicesVersionsInstances.php @@ -49,7 +49,18 @@ class Google_Service_Appengine_Resource_AppsServicesVersionsInstances extends Go return $this->call('debug', array($params), "Google_Service_Appengine_Operation"); } /** - * Stops a running instance. (instances.delete) + * Stops a running instance.The instance might be automatically recreated based + * on the scaling settings of the version. For more information, see "How + * Instances are Managed" (standard environment + * (https://cloud.google.com/appengine/docs/standard/python/how-instances-are- + * managed) | flexible environment + * (https://cloud.google.com/appengine/docs/flexible/python/how-instances-are- + * managed)).To ensure that instances are not re-created and avoid getting + * billed, you can stop all instances within the target version by changing the + * serving status of the version to 'STOPPEDwith the + * [apps.services.versions.patch`](https://cloud.google.com/appengine/docs + * /admin-api/reference/rest/v1/apps.services.versions/patch) method. + * (instances.delete) * * @param string $appsId Part of `name`. Name of the resource requested. * Example: apps/myapp/services/default/versions/v1/instances/instance-1. diff --git a/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService.php b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService.php new file mode 100644 index 0000000..685d990 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService.php @@ -0,0 +1,175 @@ + + * Allows users to manage BigQuery connections to external data sources.

+ * + *

+ * For more information about this service, see the API + * Documentation + *

+ * + * @author Google, Inc. + */ +class Google_Service_BigQueryConnectionService extends Google_Service +{ + /** View and manage your data in Google BigQuery. */ + const BIGQUERY = + "https://www.googleapis.com/auth/bigquery"; + /** View and manage your data across Google Cloud Platform services. */ + const CLOUD_PLATFORM = + "https://www.googleapis.com/auth/cloud-platform"; + + public $projects_locations_connections; + + /** + * Constructs the internal representation of the BigQueryConnectionService + * service. + * + * @param Google_Client $client The client used to deliver requests. + * @param string $rootUrl The root URL used for requests to the service. + */ + public function __construct(Google_Client $client, $rootUrl = null) + { + parent::__construct($client); + $this->rootUrl = $rootUrl ?: 'https://bigqueryconnection.googleapis.com/'; + $this->servicePath = ''; + $this->batchPath = 'batch'; + $this->version = 'v1beta1'; + $this->serviceName = 'bigqueryconnection'; + + $this->projects_locations_connections = new Google_Service_BigQueryConnectionService_Resource_ProjectsLocationsConnections( + $this, + $this->serviceName, + 'connections', + array( + 'methods' => array( + 'create' => array( + 'path' => 'v1beta1/{+parent}/connections', + 'httpMethod' => 'POST', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'connectionId' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'delete' => array( + 'path' => 'v1beta1/{+name}', + 'httpMethod' => 'DELETE', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'get' => array( + 'path' => 'v1beta1/{+name}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'getIamPolicy' => array( + 'path' => 'v1beta1/{+resource}:getIamPolicy', + 'httpMethod' => 'POST', + 'parameters' => array( + 'resource' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'list' => array( + 'path' => 'v1beta1/{+parent}/connections', + 'httpMethod' => 'GET', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'maxResults' => array( + 'location' => 'query', + 'type' => 'integer', + ), + ), + ),'patch' => array( + 'path' => 'v1beta1/{+name}', + 'httpMethod' => 'PATCH', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'updateMask' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'setIamPolicy' => array( + 'path' => 'v1beta1/{+resource}:setIamPolicy', + 'httpMethod' => 'POST', + 'parameters' => array( + 'resource' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'testIamPermissions' => array( + 'path' => 'v1beta1/{+resource}:testIamPermissions', + 'httpMethod' => 'POST', + 'parameters' => array( + 'resource' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'updateCredential' => array( + 'path' => 'v1beta1/{+name}', + 'httpMethod' => 'PATCH', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ), + ) + ) + ); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/AuditConfig.php b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/AuditConfig.php new file mode 100644 index 0000000..5bc2c15 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/AuditConfig.php @@ -0,0 +1,47 @@ +auditLogConfigs = $auditLogConfigs; + } + /** + * @return Google_Service_BigQueryConnectionService_AuditLogConfig + */ + public function getAuditLogConfigs() + { + return $this->auditLogConfigs; + } + public function setService($service) + { + $this->service = $service; + } + public function getService() + { + return $this->service; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/AuditLogConfig.php b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/AuditLogConfig.php new file mode 100644 index 0000000..b4aa8f7 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/AuditLogConfig.php @@ -0,0 +1,40 @@ +exemptedMembers = $exemptedMembers; + } + public function getExemptedMembers() + { + return $this->exemptedMembers; + } + public function setLogType($logType) + { + $this->logType = $logType; + } + public function getLogType() + { + return $this->logType; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/BigqueryconnectionEmpty.php b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/BigqueryconnectionEmpty.php new file mode 100644 index 0000000..f7ec6d5 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/BigqueryconnectionEmpty.php @@ -0,0 +1,20 @@ +condition = $condition; + } + /** + * @return Google_Service_BigQueryConnectionService_Expr + */ + public function getCondition() + { + return $this->condition; + } + public function setMembers($members) + { + $this->members = $members; + } + public function getMembers() + { + return $this->members; + } + public function setRole($role) + { + $this->role = $role; + } + public function getRole() + { + return $this->role; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/CloudSqlCredential.php b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/CloudSqlCredential.php new file mode 100644 index 0000000..595f672 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/CloudSqlCredential.php @@ -0,0 +1,39 @@ +password = $password; + } + public function getPassword() + { + return $this->password; + } + public function setUsername($username) + { + $this->username = $username; + } + public function getUsername() + { + return $this->username; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1FaceAnnotationLandmark.php b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/CloudSqlProperties.php similarity index 56% rename from vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1FaceAnnotationLandmark.php rename to vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/CloudSqlProperties.php index 472b20b..3f094d7 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1FaceAnnotationLandmark.php +++ b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/CloudSqlProperties.php @@ -15,25 +15,27 @@ * the License. */ -class Google_Service_Vision_GoogleCloudVisionV1p5beta1FaceAnnotationLandmark extends Google_Model +class Google_Service_BigQueryConnectionService_CloudSqlProperties extends Google_Model { - protected $positionType = 'Google_Service_Vision_GoogleCloudVisionV1p5beta1Position'; - protected $positionDataType = ''; + public $database; + public $instanceId; public $type; - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1Position - */ - public function setPosition(Google_Service_Vision_GoogleCloudVisionV1p5beta1Position $position) + public function setDatabase($database) { - $this->position = $position; + $this->database = $database; } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1Position - */ - public function getPosition() + public function getDatabase() { - return $this->position; + return $this->database; + } + public function setInstanceId($instanceId) + { + $this->instanceId = $instanceId; + } + public function getInstanceId() + { + return $this->instanceId; } public function setType($type) { diff --git a/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/Connection.php b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/Connection.php new file mode 100644 index 0000000..b6db6e5 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/Connection.php @@ -0,0 +1,91 @@ +cloudSql = $cloudSql; + } + /** + * @return Google_Service_BigQueryConnectionService_CloudSqlProperties + */ + public function getCloudSql() + { + return $this->cloudSql; + } + 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 setFriendlyName($friendlyName) + { + $this->friendlyName = $friendlyName; + } + public function getFriendlyName() + { + return $this->friendlyName; + } + public function setHasCredential($hasCredential) + { + $this->hasCredential = $hasCredential; + } + public function getHasCredential() + { + return $this->hasCredential; + } + public function setLastModifiedTime($lastModifiedTime) + { + $this->lastModifiedTime = $lastModifiedTime; + } + public function getLastModifiedTime() + { + return $this->lastModifiedTime; + } + public function setName($name) + { + $this->name = $name; + } + public function getName() + { + return $this->name; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/ConnectionCredential.php b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/ConnectionCredential.php new file mode 100644 index 0000000..c57b574 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/ConnectionCredential.php @@ -0,0 +1,37 @@ +cloudSql = $cloudSql; + } + /** + * @return Google_Service_BigQueryConnectionService_CloudSqlCredential + */ + public function getCloudSql() + { + return $this->cloudSql; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/Expr.php b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/Expr.php new file mode 100644 index 0000000..550bbc6 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/Expr.php @@ -0,0 +1,57 @@ +description = $description; + } + public function getDescription() + { + return $this->description; + } + public function setExpression($expression) + { + $this->expression = $expression; + } + public function getExpression() + { + return $this->expression; + } + public function setLocation($location) + { + $this->location = $location; + } + public function getLocation() + { + return $this->location; + } + public function setTitle($title) + { + $this->title = $title; + } + public function getTitle() + { + return $this->title; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GetIamPolicyRequest.php b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/GetIamPolicyRequest.php similarity index 64% rename from vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GetIamPolicyRequest.php rename to vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/GetIamPolicyRequest.php index d584abf..93a4f1a 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GetIamPolicyRequest.php +++ b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/GetIamPolicyRequest.php @@ -15,20 +15,20 @@ * the License. */ -class Google_Service_CloudHealthcare_GetIamPolicyRequest extends Google_Model +class Google_Service_BigQueryConnectionService_GetIamPolicyRequest extends Google_Model { - protected $optionsType = 'Google_Service_CloudHealthcare_GetPolicyOptions'; + protected $optionsType = 'Google_Service_BigQueryConnectionService_GetPolicyOptions'; protected $optionsDataType = ''; /** - * @param Google_Service_CloudHealthcare_GetPolicyOptions + * @param Google_Service_BigQueryConnectionService_GetPolicyOptions */ - public function setOptions(Google_Service_CloudHealthcare_GetPolicyOptions $options) + public function setOptions(Google_Service_BigQueryConnectionService_GetPolicyOptions $options) { $this->options = $options; } /** - * @return Google_Service_CloudHealthcare_GetPolicyOptions + * @return Google_Service_BigQueryConnectionService_GetPolicyOptions */ public function getOptions() { diff --git a/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/GetPolicyOptions.php b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/GetPolicyOptions.php new file mode 100644 index 0000000..fd9be84 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/GetPolicyOptions.php @@ -0,0 +1,30 @@ +requestedPolicyVersion = $requestedPolicyVersion; + } + public function getRequestedPolicyVersion() + { + return $this->requestedPolicyVersion; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/ListAnnotationStoresResponse.php b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/ListConnectionsResponse.php similarity index 59% rename from vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/ListAnnotationStoresResponse.php rename to vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/ListConnectionsResponse.php index bc1be7f..5810a01 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/ListAnnotationStoresResponse.php +++ b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/ListConnectionsResponse.php @@ -15,26 +15,26 @@ * the License. */ -class Google_Service_CloudHealthcare_ListAnnotationStoresResponse extends Google_Collection +class Google_Service_BigQueryConnectionService_ListConnectionsResponse extends Google_Collection { - protected $collection_key = 'annotationStores'; - protected $annotationStoresType = 'Google_Service_CloudHealthcare_AnnotationStore'; - protected $annotationStoresDataType = 'array'; + protected $collection_key = 'connections'; + protected $connectionsType = 'Google_Service_BigQueryConnectionService_Connection'; + protected $connectionsDataType = 'array'; public $nextPageToken; /** - * @param Google_Service_CloudHealthcare_AnnotationStore + * @param Google_Service_BigQueryConnectionService_Connection */ - public function setAnnotationStores($annotationStores) + public function setConnections($connections) { - $this->annotationStores = $annotationStores; + $this->connections = $connections; } /** - * @return Google_Service_CloudHealthcare_AnnotationStore + * @return Google_Service_BigQueryConnectionService_Connection */ - public function getAnnotationStores() + public function getConnections() { - return $this->annotationStores; + return $this->connections; } public function setNextPageToken($nextPageToken) { diff --git a/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/Policy.php b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/Policy.php new file mode 100644 index 0000000..3fe2cf4 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/Policy.php @@ -0,0 +1,72 @@ +auditConfigs = $auditConfigs; + } + /** + * @return Google_Service_BigQueryConnectionService_AuditConfig + */ + public function getAuditConfigs() + { + return $this->auditConfigs; + } + /** + * @param Google_Service_BigQueryConnectionService_Binding + */ + public function setBindings($bindings) + { + $this->bindings = $bindings; + } + /** + * @return Google_Service_BigQueryConnectionService_Binding + */ + public function getBindings() + { + return $this->bindings; + } + public function setEtag($etag) + { + $this->etag = $etag; + } + public function getEtag() + { + return $this->etag; + } + public function setVersion($version) + { + $this->version = $version; + } + public function getVersion() + { + return $this->version; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/Resource/Projects.php b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/Resource/Projects.php new file mode 100644 index 0000000..1c19297 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/Resource/Projects.php @@ -0,0 +1,28 @@ + + * $bigqueryconnectionService = new Google_Service_BigQueryConnectionService(...); + * $projects = $bigqueryconnectionService->projects; + * + */ +class Google_Service_BigQueryConnectionService_Resource_Projects extends Google_Service_Resource +{ +} diff --git a/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/Resource/ProjectsLocations.php b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/Resource/ProjectsLocations.php new file mode 100644 index 0000000..e23972c --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/Resource/ProjectsLocations.php @@ -0,0 +1,28 @@ + + * $bigqueryconnectionService = new Google_Service_BigQueryConnectionService(...); + * $locations = $bigqueryconnectionService->locations; + * + */ +class Google_Service_BigQueryConnectionService_Resource_ProjectsLocations extends Google_Service_Resource +{ +} diff --git a/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/Resource/ProjectsLocationsConnections.php b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/Resource/ProjectsLocationsConnections.php new file mode 100644 index 0000000..54569d7 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/Resource/ProjectsLocationsConnections.php @@ -0,0 +1,187 @@ + + * $bigqueryconnectionService = new Google_Service_BigQueryConnectionService(...); + * $connections = $bigqueryconnectionService->connections; + * + */ +class Google_Service_BigQueryConnectionService_Resource_ProjectsLocationsConnections extends Google_Service_Resource +{ + /** + * Creates a new connection. (connections.create) + * + * @param string $parent Parent resource name. Must be in the format + * `projects/{project_id}/locations/{location_id}` + * @param Google_Service_BigQueryConnectionService_Connection $postBody + * @param array $optParams Optional parameters. + * + * @opt_param string connectionId Optional connection id that should be assigned + * to the created connection. + * @return Google_Service_BigQueryConnectionService_Connection + */ + public function create($parent, Google_Service_BigQueryConnectionService_Connection $postBody, $optParams = array()) + { + $params = array('parent' => $parent, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('create', array($params), "Google_Service_BigQueryConnectionService_Connection"); + } + /** + * Deletes connection and associated credential. (connections.delete) + * + * @param string $name Name of the deleted connection, for example: + * `projects/{project_id}/locations/{location_id}/connections/{connection_id}` + * @param array $optParams Optional parameters. + * @return Google_Service_BigQueryConnectionService_BigqueryconnectionEmpty + */ + public function delete($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('delete', array($params), "Google_Service_BigQueryConnectionService_BigqueryconnectionEmpty"); + } + /** + * Returns specified connection. (connections.get) + * + * @param string $name Name of the requested connection, for example: + * `projects/{project_id}/locations/{location_id}/connections/{connection_id}` + * @param array $optParams Optional parameters. + * @return Google_Service_BigQueryConnectionService_Connection + */ + public function get($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('get', array($params), "Google_Service_BigQueryConnectionService_Connection"); + } + /** + * Gets the access control policy for a resource. Returns an empty policy if the + * resource exists and does not have a policy set. (connections.getIamPolicy) + * + * @param string $resource REQUIRED: The resource for which the policy is being + * requested. See the operation documentation for the appropriate value for this + * field. + * @param Google_Service_BigQueryConnectionService_GetIamPolicyRequest $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_BigQueryConnectionService_Policy + */ + public function getIamPolicy($resource, Google_Service_BigQueryConnectionService_GetIamPolicyRequest $postBody, $optParams = array()) + { + $params = array('resource' => $resource, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('getIamPolicy', array($params), "Google_Service_BigQueryConnectionService_Policy"); + } + /** + * Returns a list of connections in the given project. + * (connections.listProjectsLocationsConnections) + * + * @param string $parent Parent resource name. Must be in the form: + * `projects/{project_id}/locations/{location_id}` + * @param array $optParams Optional parameters. + * + * @opt_param string pageToken Page token. + * @opt_param string maxResults Maximum number of results to return. + * @return Google_Service_BigQueryConnectionService_ListConnectionsResponse + */ + public function listProjectsLocationsConnections($parent, $optParams = array()) + { + $params = array('parent' => $parent); + $params = array_merge($params, $optParams); + return $this->call('list', array($params), "Google_Service_BigQueryConnectionService_ListConnectionsResponse"); + } + /** + * Updates the specified connection. For security reasons, also resets + * credential if connection properties are in the update field mask. + * (connections.patch) + * + * @param string $name Name of the connection to update, for example: + * `projects/{project_id}/locations/{location_id}/connections/{connection_id}` + * @param Google_Service_BigQueryConnectionService_Connection $postBody + * @param array $optParams Optional parameters. + * + * @opt_param string updateMask Update mask for the connection fields to be + * updated. + * @return Google_Service_BigQueryConnectionService_Connection + */ + public function patch($name, Google_Service_BigQueryConnectionService_Connection $postBody, $optParams = array()) + { + $params = array('name' => $name, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('patch', array($params), "Google_Service_BigQueryConnectionService_Connection"); + } + /** + * Sets the access control policy on the specified resource. Replaces any + * existing policy. + * + * Can return Public Errors: NOT_FOUND, INVALID_ARGUMENT and PERMISSION_DENIED + * (connections.setIamPolicy) + * + * @param string $resource REQUIRED: The resource for which the policy is being + * specified. See the operation documentation for the appropriate value for this + * field. + * @param Google_Service_BigQueryConnectionService_SetIamPolicyRequest $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_BigQueryConnectionService_Policy + */ + public function setIamPolicy($resource, Google_Service_BigQueryConnectionService_SetIamPolicyRequest $postBody, $optParams = array()) + { + $params = array('resource' => $resource, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('setIamPolicy', array($params), "Google_Service_BigQueryConnectionService_Policy"); + } + /** + * Returns permissions that a caller has on the specified resource. If the + * resource does not exist, this will return an empty set of permissions, not a + * NOT_FOUND error. + * + * Note: This operation is designed to be used for building permission-aware UIs + * and command-line tools, not for authorization checking. This operation may + * "fail open" without warning. (connections.testIamPermissions) + * + * @param string $resource REQUIRED: The resource for which the policy detail is + * being requested. See the operation documentation for the appropriate value + * for this field. + * @param Google_Service_BigQueryConnectionService_TestIamPermissionsRequest $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_BigQueryConnectionService_TestIamPermissionsResponse + */ + public function testIamPermissions($resource, Google_Service_BigQueryConnectionService_TestIamPermissionsRequest $postBody, $optParams = array()) + { + $params = array('resource' => $resource, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('testIamPermissions', array($params), "Google_Service_BigQueryConnectionService_TestIamPermissionsResponse"); + } + /** + * Sets the credential for the specified connection. + * (connections.updateCredential) + * + * @param string $name Name of the connection, for example: `projects/{project_i + * d}/locations/{location_id}/connections/{connection_id}/credential` + * @param Google_Service_BigQueryConnectionService_ConnectionCredential $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_BigQueryConnectionService_BigqueryconnectionEmpty + */ + public function updateCredential($name, Google_Service_BigQueryConnectionService_ConnectionCredential $postBody, $optParams = array()) + { + $params = array('name' => $name, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('updateCredential', array($params), "Google_Service_BigQueryConnectionService_BigqueryconnectionEmpty"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/SetIamPolicyRequest.php b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/SetIamPolicyRequest.php new file mode 100644 index 0000000..7bb6b6f --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/SetIamPolicyRequest.php @@ -0,0 +1,46 @@ +policy = $policy; + } + /** + * @return Google_Service_BigQueryConnectionService_Policy + */ + public function getPolicy() + { + return $this->policy; + } + public function setUpdateMask($updateMask) + { + $this->updateMask = $updateMask; + } + public function getUpdateMask() + { + return $this->updateMask; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/TestIamPermissionsRequest.php b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/TestIamPermissionsRequest.php new file mode 100644 index 0000000..838d18f --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/TestIamPermissionsRequest.php @@ -0,0 +1,31 @@ +permissions = $permissions; + } + public function getPermissions() + { + return $this->permissions; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/TestIamPermissionsResponse.php b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/TestIamPermissionsResponse.php new file mode 100644 index 0000000..ec4eb5c --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/BigQueryConnectionService/TestIamPermissionsResponse.php @@ -0,0 +1,31 @@ +permissions = $permissions; + } + public function getPermissions() + { + return $this->permissions; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer.php b/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer.php index d4dfe60..ae0b4c2 100644 --- a/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer.php +++ b/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer.php @@ -222,11 +222,11 @@ class Google_Service_BigQueryDataTransfer extends Google_Service 'type' => 'string', 'required' => true, ), - 'authorizationCode' => array( + 'versionInfo' => array( 'location' => 'query', 'type' => 'string', ), - 'versionInfo' => array( + 'authorizationCode' => array( 'location' => 'query', 'type' => 'string', ), @@ -260,11 +260,6 @@ class Google_Service_BigQueryDataTransfer extends Google_Service 'type' => 'string', 'required' => true, ), - 'dataSourceIds' => array( - 'location' => 'query', - 'type' => 'string', - 'repeated' => true, - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -273,6 +268,11 @@ class Google_Service_BigQueryDataTransfer extends Google_Service 'location' => 'query', 'type' => 'integer', ), + 'dataSourceIds' => array( + 'location' => 'query', + 'type' => 'string', + 'repeated' => true, + ), ), ),'patch' => array( 'path' => 'v1/{+name}', @@ -283,6 +283,10 @@ class Google_Service_BigQueryDataTransfer extends Google_Service 'type' => 'string', 'required' => true, ), + 'versionInfo' => array( + 'location' => 'query', + 'type' => 'string', + ), 'authorizationCode' => array( 'location' => 'query', 'type' => 'string', @@ -291,10 +295,6 @@ class Google_Service_BigQueryDataTransfer extends Google_Service 'location' => 'query', 'type' => 'string', ), - 'versionInfo' => array( - 'location' => 'query', - 'type' => 'string', - ), ), ),'scheduleRuns' => array( 'path' => 'v1/{+parent}:scheduleRuns', @@ -392,11 +392,6 @@ class Google_Service_BigQueryDataTransfer extends Google_Service 'type' => 'string', 'required' => true, ), - 'messageTypes' => array( - 'location' => 'query', - 'type' => 'string', - 'repeated' => true, - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -405,6 +400,11 @@ class Google_Service_BigQueryDataTransfer extends Google_Service 'location' => 'query', 'type' => 'integer', ), + 'messageTypes' => array( + 'location' => 'query', + 'type' => 'string', + 'repeated' => true, + ), ), ), ) @@ -425,11 +425,11 @@ class Google_Service_BigQueryDataTransfer extends Google_Service 'type' => 'string', 'required' => true, ), - 'authorizationCode' => array( + 'versionInfo' => array( 'location' => 'query', 'type' => 'string', ), - 'versionInfo' => array( + 'authorizationCode' => array( 'location' => 'query', 'type' => 'string', ), @@ -486,10 +486,6 @@ class Google_Service_BigQueryDataTransfer extends Google_Service 'type' => 'string', 'required' => true, ), - 'updateMask' => array( - 'location' => 'query', - 'type' => 'string', - ), 'versionInfo' => array( 'location' => 'query', 'type' => 'string', @@ -498,6 +494,10 @@ class Google_Service_BigQueryDataTransfer extends Google_Service 'location' => 'query', 'type' => 'string', ), + 'updateMask' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'scheduleRuns' => array( 'path' => 'v1/{+parent}:scheduleRuns', @@ -558,10 +558,6 @@ class Google_Service_BigQueryDataTransfer extends Google_Service 'type' => 'string', 'required' => true, ), - 'runAttempt' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -575,6 +571,10 @@ class Google_Service_BigQueryDataTransfer extends Google_Service 'location' => 'query', 'type' => 'integer', ), + 'runAttempt' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ), ) @@ -595,6 +595,11 @@ class Google_Service_BigQueryDataTransfer extends Google_Service 'type' => 'string', 'required' => true, ), + 'messageTypes' => array( + 'location' => 'query', + 'type' => 'string', + 'repeated' => true, + ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -603,11 +608,6 @@ class Google_Service_BigQueryDataTransfer extends Google_Service 'location' => 'query', 'type' => 'integer', ), - 'messageTypes' => array( - 'location' => 'query', - 'type' => 'string', - 'repeated' => true, - ), ), ), ) diff --git a/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer/Resource/ProjectsDataSources.php b/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer/Resource/ProjectsDataSources.php index cf974cd..c6bf9c9 100644 --- a/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer/Resource/ProjectsDataSources.php +++ b/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer/Resource/ProjectsDataSources.php @@ -32,7 +32,7 @@ class Google_Service_BigQueryDataTransfer_Resource_ProjectsDataSources extends G * we have OAuth token for the particular user, which is a pre-requisite before * user can create a transfer config. (dataSources.checkValidCreds) * - * @param string $name The data source in the form: + * @param string $name Required. The data source in the form: * `projects/{project_id}/dataSources/{data_source_id}` * @param Google_Service_BigQueryDataTransfer_CheckValidCredsRequest $postBody * @param array $optParams Optional parameters. @@ -48,8 +48,8 @@ class Google_Service_BigQueryDataTransfer_Resource_ProjectsDataSources extends G * Retrieves a supported data source and returns its settings, which can be used * for UI rendering. (dataSources.get) * - * @param string $name The field will contain name of the resource requested, - * for example: `projects/{project_id}/dataSources/{data_source_id}` + * @param string $name Required. The field will contain name of the resource + * requested, for example: `projects/{project_id}/dataSources/{data_source_id}` * @param array $optParams Optional parameters. * @return Google_Service_BigQueryDataTransfer_DataSource */ @@ -63,8 +63,8 @@ class Google_Service_BigQueryDataTransfer_Resource_ProjectsDataSources extends G * Lists supported data sources and returns their settings, which can be used * for UI rendering. (dataSources.listProjectsDataSources) * - * @param string $parent The BigQuery project id for which data sources should - * be returned. Must be in the form: `projects/{project_id}` + * @param string $parent Required. The BigQuery project id for which data + * sources should be returned. Must be in the form: `projects/{project_id}` * @param array $optParams Optional parameters. * * @opt_param string pageToken Pagination token, which can be used to request a diff --git a/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer/Resource/ProjectsLocationsDataSources.php b/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer/Resource/ProjectsLocationsDataSources.php index d073706..589f112 100644 --- a/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer/Resource/ProjectsLocationsDataSources.php +++ b/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer/Resource/ProjectsLocationsDataSources.php @@ -32,7 +32,7 @@ class Google_Service_BigQueryDataTransfer_Resource_ProjectsLocationsDataSources * we have OAuth token for the particular user, which is a pre-requisite before * user can create a transfer config. (dataSources.checkValidCreds) * - * @param string $name The data source in the form: + * @param string $name Required. The data source in the form: * `projects/{project_id}/dataSources/{data_source_id}` * @param Google_Service_BigQueryDataTransfer_CheckValidCredsRequest $postBody * @param array $optParams Optional parameters. @@ -48,8 +48,8 @@ class Google_Service_BigQueryDataTransfer_Resource_ProjectsLocationsDataSources * Retrieves a supported data source and returns its settings, which can be used * for UI rendering. (dataSources.get) * - * @param string $name The field will contain name of the resource requested, - * for example: `projects/{project_id}/dataSources/{data_source_id}` + * @param string $name Required. The field will contain name of the resource + * requested, for example: `projects/{project_id}/dataSources/{data_source_id}` * @param array $optParams Optional parameters. * @return Google_Service_BigQueryDataTransfer_DataSource */ @@ -63,8 +63,8 @@ class Google_Service_BigQueryDataTransfer_Resource_ProjectsLocationsDataSources * Lists supported data sources and returns their settings, which can be used * for UI rendering. (dataSources.listProjectsLocationsDataSources) * - * @param string $parent The BigQuery project id for which data sources should - * be returned. Must be in the form: `projects/{project_id}` + * @param string $parent Required. The BigQuery project id for which data + * sources should be returned. Must be in the form: `projects/{project_id}` * @param array $optParams Optional parameters. * * @opt_param string pageToken Pagination token, which can be used to request a diff --git a/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer/Resource/ProjectsLocationsTransferConfigs.php b/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer/Resource/ProjectsLocationsTransferConfigs.php index 609ebaf..db98ac5 100644 --- a/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer/Resource/ProjectsLocationsTransferConfigs.php +++ b/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer/Resource/ProjectsLocationsTransferConfigs.php @@ -28,7 +28,7 @@ class Google_Service_BigQueryDataTransfer_Resource_ProjectsLocationsTransferConf /** * Creates a new data transfer configuration. (transferConfigs.create) * - * @param string $parent The BigQuery project id where the transfer + * @param string $parent Required. The BigQuery project id where the transfer * configuration should be created. Must be in the format * projects/{project_id}/locations/{location_id} If specified location and * location of the destination bigquery dataset do not match - the request will @@ -36,6 +36,12 @@ class Google_Service_BigQueryDataTransfer_Resource_ProjectsLocationsTransferConf * @param Google_Service_BigQueryDataTransfer_TransferConfig $postBody * @param array $optParams Optional parameters. * + * @opt_param string versionInfo Optional version info. If users want to find a + * very recent access token, that is, immediately after approving access, users + * have to set the version_info claim in the token request. To obtain the + * version_info, users must use the "none+gsession" response type. which be + * return a version_info back in the authorization response which be be put in a + * JWT claim in the token request. * @opt_param string authorizationCode Optional OAuth2 authorization code to use * with this transfer configuration. This is required if new credentials are * needed, as indicated by `CheckValidCreds`. In order to obtain @@ -51,12 +57,6 @@ class Google_Service_BigQueryDataTransfer_Resource_ProjectsLocationsTransferConf * authorization code should be returned in the title bar of the browser, with * the page text prompting the user to copy the code and paste it in the * application. - * @opt_param string versionInfo Optional version info. If users want to find a - * very recent access token, that is, immediately after approving access, users - * have to set the version_info claim in the token request. To obtain the - * version_info, users must use the "none+gsession" response type. which be - * return a version_info back in the authorization response which be be put in a - * JWT claim in the token request. * @return Google_Service_BigQueryDataTransfer_TransferConfig */ public function create($parent, Google_Service_BigQueryDataTransfer_TransferConfig $postBody, $optParams = array()) @@ -69,8 +69,8 @@ class Google_Service_BigQueryDataTransfer_Resource_ProjectsLocationsTransferConf * Deletes a data transfer configuration, including any associated transfer runs * and logs. (transferConfigs.delete) * - * @param string $name The field will contain name of the resource requested, - * for example: `projects/{project_id}/transferConfigs/{config_id}` + * @param string $name Required. The field will contain name of the resource + * requested, for example: `projects/{project_id}/transferConfigs/{config_id}` * @param array $optParams Optional parameters. * @return Google_Service_BigQueryDataTransfer_BigquerydatatransferEmpty */ @@ -83,8 +83,8 @@ class Google_Service_BigQueryDataTransfer_Resource_ProjectsLocationsTransferConf /** * Returns information about a data transfer config. (transferConfigs.get) * - * @param string $name The field will contain name of the resource requested, - * for example: `projects/{project_id}/transferConfigs/{config_id}` + * @param string $name Required. The field will contain name of the resource + * requested, for example: `projects/{project_id}/transferConfigs/{config_id}` * @param array $optParams Optional parameters. * @return Google_Service_BigQueryDataTransfer_TransferConfig */ @@ -98,18 +98,18 @@ class Google_Service_BigQueryDataTransfer_Resource_ProjectsLocationsTransferConf * Returns information about all data transfers in the project. * (transferConfigs.listProjectsLocationsTransferConfigs) * - * @param string $parent The BigQuery project id for which data sources should - * be returned: `projects/{project_id}`. + * @param string $parent Required. The BigQuery project id for which data + * sources should be returned: `projects/{project_id}`. * @param array $optParams Optional parameters. * - * @opt_param string dataSourceIds When specified, only configurations of - * requested data sources are returned. * @opt_param string pageToken Pagination token, which can be used to request a * specific page of `ListTransfersRequest` list results. For multiple-page * results, `ListTransfersResponse` outputs a `next_page` token, which can be * used as the `page_token` value to request the next page of list results. * @opt_param int pageSize Page size. The default page size is the maximum value * of 1000 results. + * @opt_param string dataSourceIds When specified, only configurations of + * requested data sources are returned. * @return Google_Service_BigQueryDataTransfer_ListTransferConfigsResponse */ public function listProjectsLocationsTransferConfigs($parent, $optParams = array()) @@ -132,6 +132,12 @@ class Google_Service_BigQueryDataTransfer_Resource_ProjectsLocationsTransferConf * @param Google_Service_BigQueryDataTransfer_TransferConfig $postBody * @param array $optParams Optional parameters. * + * @opt_param string versionInfo Optional version info. If users want to find a + * very recent access token, that is, immediately after approving access, users + * have to set the version_info claim in the token request. To obtain the + * version_info, users must use the "none+gsession" response type. which be + * return a version_info back in the authorization response which be be put in a + * JWT claim in the token request. * @opt_param string authorizationCode Optional OAuth2 authorization code to use * with this transfer configuration. If it is provided, the transfer * configuration will be associated with the authorizing user. In order to @@ -147,14 +153,8 @@ class Google_Service_BigQueryDataTransfer_Resource_ProjectsLocationsTransferConf * authorization code should be returned in the title bar of the browser, with * the page text prompting the user to copy the code and paste it in the * application. - * @opt_param string updateMask Required list of fields to be updated in this - * request. - * @opt_param string versionInfo Optional version info. If users want to find a - * very recent access token, that is, immediately after approving access, users - * have to set the version_info claim in the token request. To obtain the - * version_info, users must use the "none+gsession" response type. which be - * return a version_info back in the authorization response which be be put in a - * JWT claim in the token request. + * @opt_param string updateMask Required. Required list of fields to be updated + * in this request. * @return Google_Service_BigQueryDataTransfer_TransferConfig */ public function patch($name, Google_Service_BigQueryDataTransfer_TransferConfig $postBody, $optParams = array()) @@ -170,7 +170,7 @@ class Google_Service_BigQueryDataTransfer_Resource_ProjectsLocationsTransferConf * range. DEPRECATED: use StartManualTransferRuns instead. * (transferConfigs.scheduleRuns) * - * @param string $parent Transfer configuration name in the form: + * @param string $parent Required. Transfer configuration name in the form: * `projects/{project_id}/transferConfigs/{config_id}`. * @param Google_Service_BigQueryDataTransfer_ScheduleTransferRunsRequest $postBody * @param array $optParams Optional parameters. diff --git a/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer/Resource/ProjectsLocationsTransferConfigsRuns.php b/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer/Resource/ProjectsLocationsTransferConfigsRuns.php index bf4725d..d83c6f2 100644 --- a/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer/Resource/ProjectsLocationsTransferConfigsRuns.php +++ b/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer/Resource/ProjectsLocationsTransferConfigsRuns.php @@ -28,8 +28,8 @@ class Google_Service_BigQueryDataTransfer_Resource_ProjectsLocationsTransferConf /** * Deletes the specified transfer run. (runs.delete) * - * @param string $name The field will contain name of the resource requested, - * for example: + * @param string $name Required. The field will contain name of the resource + * requested, for example: * `projects/{project_id}/transferConfigs/{config_id}/runs/{run_id}` * @param array $optParams Optional parameters. * @return Google_Service_BigQueryDataTransfer_BigquerydatatransferEmpty @@ -43,8 +43,8 @@ class Google_Service_BigQueryDataTransfer_Resource_ProjectsLocationsTransferConf /** * Returns information about the particular transfer run. (runs.get) * - * @param string $name The field will contain name of the resource requested, - * for example: + * @param string $name Required. The field will contain name of the resource + * requested, for example: * `projects/{project_id}/transferConfigs/{config_id}/runs/{run_id}` * @param array $optParams Optional parameters. * @return Google_Service_BigQueryDataTransfer_TransferRun @@ -59,9 +59,9 @@ class Google_Service_BigQueryDataTransfer_Resource_ProjectsLocationsTransferConf * Returns information about running and completed jobs. * (runs.listProjectsLocationsTransferConfigsRuns) * - * @param string $parent Name of transfer configuration for which transfer runs - * should be retrieved. Format of transfer configuration resource name is: - * `projects/{project_id}/transferConfigs/{config_id}`. + * @param string $parent Required. Name of transfer configuration for which + * transfer runs should be retrieved. Format of transfer configuration resource + * name is: `projects/{project_id}/transferConfigs/{config_id}`. * @param array $optParams Optional parameters. * * @opt_param string pageToken Pagination token, which can be used to request a diff --git a/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer/Resource/ProjectsLocationsTransferConfigsRunsTransferLogs.php b/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer/Resource/ProjectsLocationsTransferConfigsRunsTransferLogs.php index 4912081..c82765b 100644 --- a/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer/Resource/ProjectsLocationsTransferConfigsRunsTransferLogs.php +++ b/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer/Resource/ProjectsLocationsTransferConfigsRunsTransferLogs.php @@ -29,18 +29,18 @@ class Google_Service_BigQueryDataTransfer_Resource_ProjectsLocationsTransferConf * Returns user facing log messages for the data transfer run. * (transferLogs.listProjectsLocationsTransferConfigsRunsTransferLogs) * - * @param string $parent Transfer run name in the form: + * @param string $parent Required. Transfer run name in the form: * `projects/{project_id}/transferConfigs/{config_Id}/runs/{run_id}`. * @param array $optParams Optional parameters. * - * @opt_param string messageTypes Message types to return. If not populated - - * INFO, WARNING and ERROR messages are returned. * @opt_param string pageToken Pagination token, which can be used to request a * specific page of `ListTransferLogsRequest` list results. For multiple-page * results, `ListTransferLogsResponse` outputs a `next_page` token, which can be * used as the `page_token` value to request the next page of list results. * @opt_param int pageSize Page size. The default page size is the maximum value * of 1000 results. + * @opt_param string messageTypes Message types to return. If not populated - + * INFO, WARNING and ERROR messages are returned. * @return Google_Service_BigQueryDataTransfer_ListTransferLogsResponse */ public function listProjectsLocationsTransferConfigsRunsTransferLogs($parent, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer/Resource/ProjectsTransferConfigs.php b/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer/Resource/ProjectsTransferConfigs.php index d07cf82..b0792cd 100644 --- a/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer/Resource/ProjectsTransferConfigs.php +++ b/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer/Resource/ProjectsTransferConfigs.php @@ -28,7 +28,7 @@ class Google_Service_BigQueryDataTransfer_Resource_ProjectsTransferConfigs exten /** * Creates a new data transfer configuration. (transferConfigs.create) * - * @param string $parent The BigQuery project id where the transfer + * @param string $parent Required. The BigQuery project id where the transfer * configuration should be created. Must be in the format * projects/{project_id}/locations/{location_id} If specified location and * location of the destination bigquery dataset do not match - the request will @@ -36,6 +36,12 @@ class Google_Service_BigQueryDataTransfer_Resource_ProjectsTransferConfigs exten * @param Google_Service_BigQueryDataTransfer_TransferConfig $postBody * @param array $optParams Optional parameters. * + * @opt_param string versionInfo Optional version info. If users want to find a + * very recent access token, that is, immediately after approving access, users + * have to set the version_info claim in the token request. To obtain the + * version_info, users must use the "none+gsession" response type. which be + * return a version_info back in the authorization response which be be put in a + * JWT claim in the token request. * @opt_param string authorizationCode Optional OAuth2 authorization code to use * with this transfer configuration. This is required if new credentials are * needed, as indicated by `CheckValidCreds`. In order to obtain @@ -51,12 +57,6 @@ class Google_Service_BigQueryDataTransfer_Resource_ProjectsTransferConfigs exten * authorization code should be returned in the title bar of the browser, with * the page text prompting the user to copy the code and paste it in the * application. - * @opt_param string versionInfo Optional version info. If users want to find a - * very recent access token, that is, immediately after approving access, users - * have to set the version_info claim in the token request. To obtain the - * version_info, users must use the "none+gsession" response type. which be - * return a version_info back in the authorization response which be be put in a - * JWT claim in the token request. * @return Google_Service_BigQueryDataTransfer_TransferConfig */ public function create($parent, Google_Service_BigQueryDataTransfer_TransferConfig $postBody, $optParams = array()) @@ -69,8 +69,8 @@ class Google_Service_BigQueryDataTransfer_Resource_ProjectsTransferConfigs exten * Deletes a data transfer configuration, including any associated transfer runs * and logs. (transferConfigs.delete) * - * @param string $name The field will contain name of the resource requested, - * for example: `projects/{project_id}/transferConfigs/{config_id}` + * @param string $name Required. The field will contain name of the resource + * requested, for example: `projects/{project_id}/transferConfigs/{config_id}` * @param array $optParams Optional parameters. * @return Google_Service_BigQueryDataTransfer_BigquerydatatransferEmpty */ @@ -83,8 +83,8 @@ class Google_Service_BigQueryDataTransfer_Resource_ProjectsTransferConfigs exten /** * Returns information about a data transfer config. (transferConfigs.get) * - * @param string $name The field will contain name of the resource requested, - * for example: `projects/{project_id}/transferConfigs/{config_id}` + * @param string $name Required. The field will contain name of the resource + * requested, for example: `projects/{project_id}/transferConfigs/{config_id}` * @param array $optParams Optional parameters. * @return Google_Service_BigQueryDataTransfer_TransferConfig */ @@ -98,8 +98,8 @@ class Google_Service_BigQueryDataTransfer_Resource_ProjectsTransferConfigs exten * Returns information about all data transfers in the project. * (transferConfigs.listProjectsTransferConfigs) * - * @param string $parent The BigQuery project id for which data sources should - * be returned: `projects/{project_id}`. + * @param string $parent Required. The BigQuery project id for which data + * sources should be returned: `projects/{project_id}`. * @param array $optParams Optional parameters. * * @opt_param string pageToken Pagination token, which can be used to request a @@ -132,8 +132,6 @@ class Google_Service_BigQueryDataTransfer_Resource_ProjectsTransferConfigs exten * @param Google_Service_BigQueryDataTransfer_TransferConfig $postBody * @param array $optParams Optional parameters. * - * @opt_param string updateMask Required list of fields to be updated in this - * request. * @opt_param string versionInfo Optional version info. If users want to find a * very recent access token, that is, immediately after approving access, users * have to set the version_info claim in the token request. To obtain the @@ -155,6 +153,8 @@ class Google_Service_BigQueryDataTransfer_Resource_ProjectsTransferConfigs exten * authorization code should be returned in the title bar of the browser, with * the page text prompting the user to copy the code and paste it in the * application. + * @opt_param string updateMask Required. Required list of fields to be updated + * in this request. * @return Google_Service_BigQueryDataTransfer_TransferConfig */ public function patch($name, Google_Service_BigQueryDataTransfer_TransferConfig $postBody, $optParams = array()) @@ -170,7 +170,7 @@ class Google_Service_BigQueryDataTransfer_Resource_ProjectsTransferConfigs exten * range. DEPRECATED: use StartManualTransferRuns instead. * (transferConfigs.scheduleRuns) * - * @param string $parent Transfer configuration name in the form: + * @param string $parent Required. Transfer configuration name in the form: * `projects/{project_id}/transferConfigs/{config_id}`. * @param Google_Service_BigQueryDataTransfer_ScheduleTransferRunsRequest $postBody * @param array $optParams Optional parameters. diff --git a/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer/Resource/ProjectsTransferConfigsRuns.php b/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer/Resource/ProjectsTransferConfigsRuns.php index 3f0fef1..1224bf7 100644 --- a/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer/Resource/ProjectsTransferConfigsRuns.php +++ b/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer/Resource/ProjectsTransferConfigsRuns.php @@ -28,8 +28,8 @@ class Google_Service_BigQueryDataTransfer_Resource_ProjectsTransferConfigsRuns e /** * Deletes the specified transfer run. (runs.delete) * - * @param string $name The field will contain name of the resource requested, - * for example: + * @param string $name Required. The field will contain name of the resource + * requested, for example: * `projects/{project_id}/transferConfigs/{config_id}/runs/{run_id}` * @param array $optParams Optional parameters. * @return Google_Service_BigQueryDataTransfer_BigquerydatatransferEmpty @@ -43,8 +43,8 @@ class Google_Service_BigQueryDataTransfer_Resource_ProjectsTransferConfigsRuns e /** * Returns information about the particular transfer run. (runs.get) * - * @param string $name The field will contain name of the resource requested, - * for example: + * @param string $name Required. The field will contain name of the resource + * requested, for example: * `projects/{project_id}/transferConfigs/{config_id}/runs/{run_id}` * @param array $optParams Optional parameters. * @return Google_Service_BigQueryDataTransfer_TransferRun @@ -59,12 +59,11 @@ class Google_Service_BigQueryDataTransfer_Resource_ProjectsTransferConfigsRuns e * Returns information about running and completed jobs. * (runs.listProjectsTransferConfigsRuns) * - * @param string $parent Name of transfer configuration for which transfer runs - * should be retrieved. Format of transfer configuration resource name is: - * `projects/{project_id}/transferConfigs/{config_id}`. + * @param string $parent Required. Name of transfer configuration for which + * transfer runs should be retrieved. Format of transfer configuration resource + * name is: `projects/{project_id}/transferConfigs/{config_id}`. * @param array $optParams Optional parameters. * - * @opt_param string runAttempt Indicates how run attempts are to be pulled. * @opt_param string pageToken Pagination token, which can be used to request a * specific page of `ListTransferRunsRequest` list results. For multiple-page * results, `ListTransferRunsResponse` outputs a `next_page` token, which can be @@ -73,6 +72,7 @@ class Google_Service_BigQueryDataTransfer_Resource_ProjectsTransferConfigsRuns e * states are returned. * @opt_param int pageSize Page size. The default page size is the maximum value * of 1000 results. + * @opt_param string runAttempt Indicates how run attempts are to be pulled. * @return Google_Service_BigQueryDataTransfer_ListTransferRunsResponse */ public function listProjectsTransferConfigsRuns($parent, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer/Resource/ProjectsTransferConfigsRunsTransferLogs.php b/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer/Resource/ProjectsTransferConfigsRunsTransferLogs.php index 5a42bc7..aaaf027 100644 --- a/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer/Resource/ProjectsTransferConfigsRunsTransferLogs.php +++ b/vendor/google/apiclient-services/src/Google/Service/BigQueryDataTransfer/Resource/ProjectsTransferConfigsRunsTransferLogs.php @@ -29,18 +29,18 @@ class Google_Service_BigQueryDataTransfer_Resource_ProjectsTransferConfigsRunsTr * Returns user facing log messages for the data transfer run. * (transferLogs.listProjectsTransferConfigsRunsTransferLogs) * - * @param string $parent Transfer run name in the form: + * @param string $parent Required. Transfer run name in the form: * `projects/{project_id}/transferConfigs/{config_Id}/runs/{run_id}`. * @param array $optParams Optional parameters. * + * @opt_param string messageTypes Message types to return. If not populated - + * INFO, WARNING and ERROR messages are returned. * @opt_param string pageToken Pagination token, which can be used to request a * specific page of `ListTransferLogsRequest` list results. For multiple-page * results, `ListTransferLogsResponse` outputs a `next_page` token, which can be * used as the `page_token` value to request the next page of list results. * @opt_param int pageSize Page size. The default page size is the maximum value * of 1000 results. - * @opt_param string messageTypes Message types to return. If not populated - - * INFO, WARNING and ERROR messages are returned. * @return Google_Service_BigQueryDataTransfer_ListTransferLogsResponse */ public function listProjectsTransferConfigsRunsTransferLogs($parent, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/BigQueryReservation.php b/vendor/google/apiclient-services/src/Google/Service/BigQueryReservation.php new file mode 100644 index 0000000..96a4642 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/BigQueryReservation.php @@ -0,0 +1,100 @@ + + * A service to modify your BigQuery flat-rate reservations.

+ * + *

+ * For more information about this service, see the API + * Documentation + *

+ * + * @author Google, Inc. + */ +class Google_Service_BigQueryReservation extends Google_Service +{ + /** View and manage your data in Google BigQuery. */ + const BIGQUERY = + "https://www.googleapis.com/auth/bigquery"; + /** View and manage your data across Google Cloud Platform services. */ + const CLOUD_PLATFORM = + "https://www.googleapis.com/auth/cloud-platform"; + + public $operations; + + /** + * Constructs the internal representation of the BigQueryReservation service. + * + * @param Google_Client $client The client used to deliver requests. + * @param string $rootUrl The root URL used for requests to the service. + */ + public function __construct(Google_Client $client, $rootUrl = null) + { + parent::__construct($client); + $this->rootUrl = $rootUrl ?: 'https://bigqueryreservation.googleapis.com/'; + $this->servicePath = ''; + $this->batchPath = 'batch'; + $this->version = 'v1'; + $this->serviceName = 'bigqueryreservation'; + + $this->operations = new Google_Service_BigQueryReservation_Resource_Operations( + $this, + $this->serviceName, + 'operations', + array( + 'methods' => array( + 'delete' => array( + 'path' => 'v1/{+name}', + 'httpMethod' => 'DELETE', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'list' => array( + 'path' => 'v1/{+name}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'pageSize' => array( + 'location' => 'query', + 'type' => 'integer', + ), + ), + ), + ) + ) + ); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/BigQueryReservation/BigqueryreservationEmpty.php b/vendor/google/apiclient-services/src/Google/Service/BigQueryReservation/BigqueryreservationEmpty.php new file mode 100644 index 0000000..f94d5e5 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/BigQueryReservation/BigqueryreservationEmpty.php @@ -0,0 +1,20 @@ +capacityCommitment = $capacityCommitment; + } + public function getCapacityCommitment() + { + return $this->capacityCommitment; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/BigQueryReservation/ListOperationsResponse.php b/vendor/google/apiclient-services/src/Google/Service/BigQueryReservation/ListOperationsResponse.php new file mode 100644 index 0000000..706b41e --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/BigQueryReservation/ListOperationsResponse.php @@ -0,0 +1,47 @@ +nextPageToken = $nextPageToken; + } + public function getNextPageToken() + { + return $this->nextPageToken; + } + /** + * @param Google_Service_BigQueryReservation_Operation + */ + public function setOperations($operations) + { + $this->operations = $operations; + } + /** + * @return Google_Service_BigQueryReservation_Operation + */ + public function getOperations() + { + return $this->operations; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1alpha2FhirRestGcsErrorDestination.php b/vendor/google/apiclient-services/src/Google/Service/BigQueryReservation/LocationMetadata.php similarity index 68% rename from vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1alpha2FhirRestGcsErrorDestination.php rename to vendor/google/apiclient-services/src/Google/Service/BigQueryReservation/LocationMetadata.php index 99e49e7..ad46c66 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1alpha2FhirRestGcsErrorDestination.php +++ b/vendor/google/apiclient-services/src/Google/Service/BigQueryReservation/LocationMetadata.php @@ -15,16 +15,16 @@ * the License. */ -class Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2FhirRestGcsErrorDestination extends Google_Model +class Google_Service_BigQueryReservation_LocationMetadata extends Google_Model { - public $uriPrefix; + public $legacyLocationId; - public function setUriPrefix($uriPrefix) + public function setLegacyLocationId($legacyLocationId) { - $this->uriPrefix = $uriPrefix; + $this->legacyLocationId = $legacyLocationId; } - public function getUriPrefix() + public function getLegacyLocationId() { - return $this->uriPrefix; + return $this->legacyLocationId; } } diff --git a/vendor/google/apiclient-services/src/Google/Service/BigQueryReservation/Operation.php b/vendor/google/apiclient-services/src/Google/Service/BigQueryReservation/Operation.php new file mode 100644 index 0000000..5dc3245 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/BigQueryReservation/Operation.php @@ -0,0 +1,73 @@ +done = $done; + } + public function getDone() + { + return $this->done; + } + /** + * @param Google_Service_BigQueryReservation_Status + */ + public function setError(Google_Service_BigQueryReservation_Status $error) + { + $this->error = $error; + } + /** + * @return Google_Service_BigQueryReservation_Status + */ + public function getError() + { + return $this->error; + } + public function setMetadata($metadata) + { + $this->metadata = $metadata; + } + public function getMetadata() + { + return $this->metadata; + } + public function setName($name) + { + $this->name = $name; + } + public function getName() + { + return $this->name; + } + public function setResponse($response) + { + $this->response = $response; + } + public function getResponse() + { + return $this->response; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/BigQueryReservation/Resource/Operations.php b/vendor/google/apiclient-services/src/Google/Service/BigQueryReservation/Resource/Operations.php new file mode 100644 index 0000000..6c0c7cf --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/BigQueryReservation/Resource/Operations.php @@ -0,0 +1,70 @@ + + * $bigqueryreservationService = new Google_Service_BigQueryReservation(...); + * $operations = $bigqueryreservationService->operations; + * + */ +class Google_Service_BigQueryReservation_Resource_Operations extends Google_Service_Resource +{ + /** + * Deletes a long-running operation. This method indicates that the client is no + * longer interested in the operation result. It does not cancel the operation. + * If the server doesn't support this method, it returns + * `google.rpc.Code.UNIMPLEMENTED`. (operations.delete) + * + * @param string $name The name of the operation resource to be deleted. + * @param array $optParams Optional parameters. + * @return Google_Service_BigQueryReservation_BigqueryreservationEmpty + */ + public function delete($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('delete', array($params), "Google_Service_BigQueryReservation_BigqueryreservationEmpty"); + } + /** + * Lists operations that match the specified filter in the request. If the + * server doesn't support this method, it returns `UNIMPLEMENTED`. + * + * NOTE: the `name` binding allows API services to override the binding to use + * different resource name schemes, such as `users/operations`. To override the + * binding, API services can add a binding such as + * `"/v1/{name=users}/operations"` to their service configuration. For backwards + * compatibility, the default name includes the operations collection id, + * however overriding users must ensure the name binding is the parent resource, + * without the operations collection id. (operations.listOperations) + * + * @param string $name The name of the operation's parent resource. + * @param array $optParams Optional parameters. + * + * @opt_param string filter The standard list filter. + * @opt_param string pageToken The standard list page token. + * @opt_param int pageSize The standard list page size. + * @return Google_Service_BigQueryReservation_ListOperationsResponse + */ + public function listOperations($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('list', array($params), "Google_Service_BigQueryReservation_ListOperationsResponse"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/BigQueryReservation/Status.php b/vendor/google/apiclient-services/src/Google/Service/BigQueryReservation/Status.php new file mode 100644 index 0000000..e354ca3 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/BigQueryReservation/Status.php @@ -0,0 +1,49 @@ +code = $code; + } + public function getCode() + { + return $this->code; + } + public function setDetails($details) + { + $this->details = $details; + } + public function getDetails() + { + return $this->details; + } + public function setMessage($message) + { + $this->message = $message; + } + public function getMessage() + { + return $this->message; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Bigquery.php b/vendor/google/apiclient-services/src/Google/Service/Bigquery.php index 56f511d..aaefd8b 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Bigquery.php +++ b/vendor/google/apiclient-services/src/Google/Service/Bigquery.php @@ -72,7 +72,7 @@ class Google_Service_Bigquery extends Google_Service public function __construct(Google_Client $client, $rootUrl = null) { parent::__construct($client); - $this->rootUrl = $rootUrl ?: 'https://www.googleapis.com/'; + $this->rootUrl = $rootUrl ?: 'https://bigquery.googleapis.com/'; $this->servicePath = 'bigquery/v2/'; $this->batchPath = 'batch/bigquery/v2'; $this->version = 'v2'; @@ -137,14 +137,6 @@ class Google_Service_Bigquery extends Google_Service 'type' => 'string', 'required' => true, ), - 'all' => array( - 'location' => 'query', - 'type' => 'boolean', - ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -153,6 +145,14 @@ class Google_Service_Bigquery extends Google_Service 'location' => 'query', 'type' => 'integer', ), + 'all' => array( + 'location' => 'query', + 'type' => 'boolean', + ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'patch' => array( 'path' => 'projects/{projectId}/datasets/{datasetId}', @@ -286,6 +286,30 @@ class Google_Service_Bigquery extends Google_Service 'type' => 'string', 'required' => true, ), + 'parentJobId' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'minCreationTime' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'allUsers' => array( + 'location' => 'query', + 'type' => 'boolean', + ), + 'maxResults' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'maxCreationTime' => array( + 'location' => 'query', + 'type' => 'string', + ), 'stateFilter' => array( 'location' => 'query', 'type' => 'string', @@ -295,30 +319,6 @@ class Google_Service_Bigquery extends Google_Service 'location' => 'query', 'type' => 'string', ), - 'minCreationTime' => array( - 'location' => 'query', - 'type' => 'string', - ), - 'parentJobId' => array( - 'location' => 'query', - 'type' => 'string', - ), - 'allUsers' => array( - 'location' => 'query', - 'type' => 'boolean', - ), - 'pageToken' => array( - 'location' => 'query', - 'type' => 'string', - ), - 'maxCreationTime' => array( - 'location' => 'query', - 'type' => 'string', - ), - 'maxResults' => array( - 'location' => 'query', - 'type' => 'integer', - ), ), ),'query' => array( 'path' => 'projects/{projectId}/queries', @@ -394,14 +394,14 @@ class Google_Service_Bigquery extends Google_Service 'type' => 'string', 'required' => true, ), - 'maxResults' => array( - 'location' => 'query', - 'type' => 'integer', - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', ), + 'maxResults' => array( + 'location' => 'query', + 'type' => 'integer', + ), ), ),'patch' => array( 'path' => 'projects/{+projectId}/datasets/{+datasetId}/models/{+modelId}', @@ -539,14 +539,14 @@ class Google_Service_Bigquery extends Google_Service 'type' => 'string', 'required' => true, ), - 'pageToken' => array( - 'location' => 'query', - 'type' => 'string', - ), 'maxResults' => array( 'location' => 'query', 'type' => 'integer', ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'update' => array( 'path' => 'projects/{+projectId}/datasets/{+datasetId}/routines/{+routineId}', diff --git a/vendor/google/apiclient-services/src/Google/Service/Bigquery/ArimaCoefficients.php b/vendor/google/apiclient-services/src/Google/Service/Bigquery/ArimaCoefficients.php new file mode 100644 index 0000000..0b141ff --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Bigquery/ArimaCoefficients.php @@ -0,0 +1,49 @@ +autoRegressiveCoefficients = $autoRegressiveCoefficients; + } + public function getAutoRegressiveCoefficients() + { + return $this->autoRegressiveCoefficients; + } + public function setInterceptCoefficient($interceptCoefficient) + { + $this->interceptCoefficient = $interceptCoefficient; + } + public function getInterceptCoefficient() + { + return $this->interceptCoefficient; + } + public function setMovingAverageCoefficients($movingAverageCoefficients) + { + $this->movingAverageCoefficients = $movingAverageCoefficients; + } + public function getMovingAverageCoefficients() + { + return $this->movingAverageCoefficients; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Bigquery/ArimaFittingMetrics.php b/vendor/google/apiclient-services/src/Google/Service/Bigquery/ArimaFittingMetrics.php new file mode 100644 index 0000000..2cd9dd2 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Bigquery/ArimaFittingMetrics.php @@ -0,0 +1,48 @@ +aic = $aic; + } + public function getAic() + { + return $this->aic; + } + public function setLogLikelihood($logLikelihood) + { + $this->logLikelihood = $logLikelihood; + } + public function getLogLikelihood() + { + return $this->logLikelihood; + } + public function setVariance($variance) + { + $this->variance = $variance; + } + public function getVariance() + { + return $this->variance; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Bigquery/ArimaModelInfo.php b/vendor/google/apiclient-services/src/Google/Service/Bigquery/ArimaModelInfo.php new file mode 100644 index 0000000..8c90648 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Bigquery/ArimaModelInfo.php @@ -0,0 +1,69 @@ +arimaCoefficients = $arimaCoefficients; + } + /** + * @return Google_Service_Bigquery_ArimaCoefficients + */ + public function getArimaCoefficients() + { + return $this->arimaCoefficients; + } + /** + * @param Google_Service_Bigquery_ArimaFittingMetrics + */ + public function setArimaFittingMetrics(Google_Service_Bigquery_ArimaFittingMetrics $arimaFittingMetrics) + { + $this->arimaFittingMetrics = $arimaFittingMetrics; + } + /** + * @return Google_Service_Bigquery_ArimaFittingMetrics + */ + public function getArimaFittingMetrics() + { + return $this->arimaFittingMetrics; + } + /** + * @param Google_Service_Bigquery_ArimaOrder + */ + public function setNonSeasonalOrder(Google_Service_Bigquery_ArimaOrder $nonSeasonalOrder) + { + $this->nonSeasonalOrder = $nonSeasonalOrder; + } + /** + * @return Google_Service_Bigquery_ArimaOrder + */ + public function getNonSeasonalOrder() + { + return $this->nonSeasonalOrder; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1Position.php b/vendor/google/apiclient-services/src/Google/Service/Bigquery/ArimaOrder.php similarity index 62% rename from vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1Position.php rename to vendor/google/apiclient-services/src/Google/Service/Bigquery/ArimaOrder.php index cab12fb..16239d4 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1Position.php +++ b/vendor/google/apiclient-services/src/Google/Service/Bigquery/ArimaOrder.php @@ -15,34 +15,34 @@ * the License. */ -class Google_Service_Vision_GoogleCloudVisionV1p5beta1Position extends Google_Model +class Google_Service_Bigquery_ArimaOrder extends Google_Model { - public $x; - public $y; - public $z; + public $d; + public $p; + public $q; - public function setX($x) + public function setD($d) { - $this->x = $x; + $this->d = $d; } - public function getX() + public function getD() { - return $this->x; + return $this->d; } - public function setY($y) + public function setP($p) { - $this->y = $y; + $this->p = $p; } - public function getY() + public function getP() { - return $this->y; + return $this->p; } - public function setZ($z) + public function setQ($q) { - $this->z = $z; + $this->q = $q; } - public function getZ() + public function getQ() { - return $this->z; + return $this->q; } } diff --git a/vendor/google/apiclient-services/src/Google/Service/Bigquery/ArimaResult.php b/vendor/google/apiclient-services/src/Google/Service/Bigquery/ArimaResult.php new file mode 100644 index 0000000..4e72ddc --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Bigquery/ArimaResult.php @@ -0,0 +1,47 @@ +arimaModelInfo = $arimaModelInfo; + } + /** + * @return Google_Service_Bigquery_ArimaModelInfo + */ + public function getArimaModelInfo() + { + return $this->arimaModelInfo; + } + public function setSeasonalPeriods($seasonalPeriods) + { + $this->seasonalPeriods = $seasonalPeriods; + } + public function getSeasonalPeriods() + { + return $this->seasonalPeriods; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Bigquery/IterationResult.php b/vendor/google/apiclient-services/src/Google/Service/Bigquery/IterationResult.php index 794587e..4b4e1b7 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Bigquery/IterationResult.php +++ b/vendor/google/apiclient-services/src/Google/Service/Bigquery/IterationResult.php @@ -18,6 +18,8 @@ class Google_Service_Bigquery_IterationResult extends Google_Collection { protected $collection_key = 'clusterInfos'; + protected $arimaResultType = 'Google_Service_Bigquery_ArimaResult'; + protected $arimaResultDataType = ''; protected $clusterInfosType = 'Google_Service_Bigquery_ClusterInfo'; protected $clusterInfosDataType = 'array'; public $durationMs; @@ -26,6 +28,20 @@ class Google_Service_Bigquery_IterationResult extends Google_Collection public $learnRate; public $trainingLoss; + /** + * @param Google_Service_Bigquery_ArimaResult + */ + public function setArimaResult(Google_Service_Bigquery_ArimaResult $arimaResult) + { + $this->arimaResult = $arimaResult; + } + /** + * @return Google_Service_Bigquery_ArimaResult + */ + public function getArimaResult() + { + return $this->arimaResult; + } /** * @param Google_Service_Bigquery_ClusterInfo */ diff --git a/vendor/google/apiclient-services/src/Google/Service/Bigquery/JobConfigurationExtract.php b/vendor/google/apiclient-services/src/Google/Service/Bigquery/JobConfigurationExtract.php index 5ee51b7..4e7df8a 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Bigquery/JobConfigurationExtract.php +++ b/vendor/google/apiclient-services/src/Google/Service/Bigquery/JobConfigurationExtract.php @@ -24,8 +24,11 @@ class Google_Service_Bigquery_JobConfigurationExtract extends Google_Collection public $destinationUris; public $fieldDelimiter; public $printHeader; + protected $sourceModelType = 'Google_Service_Bigquery_ModelReference'; + protected $sourceModelDataType = ''; protected $sourceTableType = 'Google_Service_Bigquery_TableReference'; protected $sourceTableDataType = ''; + public $useAvroLogicalTypes; public function setCompression($compression) { @@ -75,6 +78,20 @@ class Google_Service_Bigquery_JobConfigurationExtract extends Google_Collection { return $this->printHeader; } + /** + * @param Google_Service_Bigquery_ModelReference + */ + public function setSourceModel(Google_Service_Bigquery_ModelReference $sourceModel) + { + $this->sourceModel = $sourceModel; + } + /** + * @return Google_Service_Bigquery_ModelReference + */ + public function getSourceModel() + { + return $this->sourceModel; + } /** * @param Google_Service_Bigquery_TableReference */ @@ -89,4 +106,12 @@ class Google_Service_Bigquery_JobConfigurationExtract extends Google_Collection { return $this->sourceTable; } + public function setUseAvroLogicalTypes($useAvroLogicalTypes) + { + $this->useAvroLogicalTypes = $useAvroLogicalTypes; + } + public function getUseAvroLogicalTypes() + { + return $this->useAvroLogicalTypes; + } } diff --git a/vendor/google/apiclient-services/src/Google/Service/Bigquery/JobStatistics.php b/vendor/google/apiclient-services/src/Google/Service/Bigquery/JobStatistics.php index a35457e..ca61f51 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Bigquery/JobStatistics.php +++ b/vendor/google/apiclient-services/src/Google/Service/Bigquery/JobStatistics.php @@ -36,6 +36,8 @@ class Google_Service_Bigquery_JobStatistics extends Google_Collection protected $reservationUsageType = 'Google_Service_Bigquery_JobStatisticsReservationUsage'; protected $reservationUsageDataType = 'array'; public $reservationId; + protected $scriptStatisticsType = 'Google_Service_Bigquery_ScriptStatistics'; + protected $scriptStatisticsDataType = ''; public $startTime; public $totalBytesProcessed; public $totalSlotMs; @@ -152,6 +154,20 @@ class Google_Service_Bigquery_JobStatistics extends Google_Collection { return $this->reservationId; } + /** + * @param Google_Service_Bigquery_ScriptStatistics + */ + public function setScriptStatistics(Google_Service_Bigquery_ScriptStatistics $scriptStatistics) + { + $this->scriptStatistics = $scriptStatistics; + } + /** + * @return Google_Service_Bigquery_ScriptStatistics + */ + public function getScriptStatistics() + { + return $this->scriptStatistics; + } public function setStartTime($startTime) { $this->startTime = $startTime; diff --git a/vendor/google/apiclient-services/src/Google/Service/Bigquery/Model.php b/vendor/google/apiclient-services/src/Google/Service/Bigquery/Model.php index 4901d06..ea3951a 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Bigquery/Model.php +++ b/vendor/google/apiclient-services/src/Google/Service/Bigquery/Model.php @@ -20,6 +20,8 @@ class Google_Service_Bigquery_Model extends Google_Collection protected $collection_key = 'trainingRuns'; public $creationTime; public $description; + protected $encryptionConfigurationType = 'Google_Service_Bigquery_EncryptionConfiguration'; + protected $encryptionConfigurationDataType = ''; public $etag; public $expirationTime; protected $featureColumnsType = 'Google_Service_Bigquery_StandardSqlField'; @@ -52,6 +54,20 @@ class Google_Service_Bigquery_Model extends Google_Collection { return $this->description; } + /** + * @param Google_Service_Bigquery_EncryptionConfiguration + */ + public function setEncryptionConfiguration(Google_Service_Bigquery_EncryptionConfiguration $encryptionConfiguration) + { + $this->encryptionConfiguration = $encryptionConfiguration; + } + /** + * @return Google_Service_Bigquery_EncryptionConfiguration + */ + public function getEncryptionConfiguration() + { + return $this->encryptionConfiguration; + } public function setEtag($etag) { $this->etag = $etag; diff --git a/vendor/google/apiclient-services/src/Google/Service/Bigquery/Resource/Datasets.php b/vendor/google/apiclient-services/src/Google/Service/Bigquery/Resource/Datasets.php index 2bb1d2f..3a7dcbc 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Bigquery/Resource/Datasets.php +++ b/vendor/google/apiclient-services/src/Google/Service/Bigquery/Resource/Datasets.php @@ -80,14 +80,14 @@ class Google_Service_Bigquery_Resource_Datasets extends Google_Service_Resource * @param string $projectId Project ID of the datasets to be listed * @param array $optParams Optional parameters. * + * @opt_param string pageToken Page token, returned by a previous call, to + * request the next page of results + * @opt_param string maxResults The maximum number of results to return * @opt_param bool all Whether to list all datasets, including hidden ones * @opt_param string filter An expression for filtering the results of the * request by label. The syntax is "labels.[:]". Multiple filters can be ANDed * together by connecting with a space. Example: "labels.department:receiving * labels.active". See Filtering datasets using labels for details. - * @opt_param string pageToken Page token, returned by a previous call, to - * request the next page of results - * @opt_param string maxResults The maximum number of results to return * @return Google_Service_Bigquery_DatasetList */ public function listDatasets($projectId, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Bigquery/Resource/Jobs.php b/vendor/google/apiclient-services/src/Google/Service/Bigquery/Resource/Jobs.php index c22a3a6..a04467d 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Bigquery/Resource/Jobs.php +++ b/vendor/google/apiclient-services/src/Google/Service/Bigquery/Resource/Jobs.php @@ -117,22 +117,22 @@ class Google_Service_Bigquery_Resource_Jobs extends Google_Service_Resource * @param string $projectId Project ID of the jobs to list * @param array $optParams Optional parameters. * - * @opt_param string stateFilter Filter for job state - * @opt_param string projection Restrict information returned to a set of - * selected fields + * @opt_param string parentJobId If set, retrieves only jobs whose parent is + * this job. Otherwise, retrieves only jobs which have no parent * @opt_param string minCreationTime Min value for job creation time, in * milliseconds since the POSIX epoch. If set, only jobs created after or at * this timestamp are returned - * @opt_param string parentJobId If set, retrieves only jobs whose parent is - * this job. Otherwise, retrieves only jobs which have no parent - * @opt_param bool allUsers Whether to display jobs owned by all users in the - * project. Default false * @opt_param string pageToken Page token, returned by a previous call, to * request the next page of results + * @opt_param bool allUsers Whether to display jobs owned by all users in the + * project. Default false + * @opt_param string maxResults Maximum number of results to return * @opt_param string maxCreationTime Max value for job creation time, in * milliseconds since the POSIX epoch. If set, only jobs created before or at * this timestamp are returned - * @opt_param string maxResults Maximum number of results to return + * @opt_param string stateFilter Filter for job state + * @opt_param string projection Restrict information returned to a set of + * selected fields * @return Google_Service_Bigquery_JobList */ public function listJobs($projectId, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Bigquery/Resource/Models.php b/vendor/google/apiclient-services/src/Google/Service/Bigquery/Resource/Models.php index 23dcec4..08ee10a 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Bigquery/Resource/Models.php +++ b/vendor/google/apiclient-services/src/Google/Service/Bigquery/Resource/Models.php @@ -28,9 +28,9 @@ class Google_Service_Bigquery_Resource_Models extends Google_Service_Resource /** * Deletes the model specified by modelId from the dataset. (models.delete) * - * @param string $projectId Project ID of the model to delete. - * @param string $datasetId Dataset ID of the model to delete. - * @param string $modelId Model ID of the model to delete. + * @param string $projectId Required. Project ID of the model to delete. + * @param string $datasetId Required. Dataset ID of the model to delete. + * @param string $modelId Required. Model ID of the model to delete. * @param array $optParams Optional parameters. */ public function delete($projectId, $datasetId, $modelId, $optParams = array()) @@ -42,9 +42,9 @@ class Google_Service_Bigquery_Resource_Models extends Google_Service_Resource /** * Gets the specified model resource by model ID. (models.get) * - * @param string $projectId Project ID of the requested model. - * @param string $datasetId Dataset ID of the requested model. - * @param string $modelId Model ID of the requested model. + * @param string $projectId Required. Project ID of the requested model. + * @param string $datasetId Required. Dataset ID of the requested model. + * @param string $modelId Required. Model ID of the requested model. * @param array $optParams Optional parameters. * @return Google_Service_Bigquery_Model */ @@ -58,15 +58,15 @@ class Google_Service_Bigquery_Resource_Models extends Google_Service_Resource * Lists all models in the specified dataset. Requires the READER dataset role. * (models.listModels) * - * @param string $projectId Project ID of the models to list. - * @param string $datasetId Dataset ID of the models to list. + * @param string $projectId Required. Project ID of the models to list. + * @param string $datasetId Required. Dataset ID of the models to list. * @param array $optParams Optional parameters. * + * @opt_param string pageToken Page token, returned by a previous call to + * request the next page of results * @opt_param string maxResults The maximum number of results to return in a * single response page. Leverage the page tokens to iterate through the entire * collection. - * @opt_param string pageToken Page token, returned by a previous call to - * request the next page of results * @return Google_Service_Bigquery_ListModelsResponse */ public function listModels($projectId, $datasetId, $optParams = array()) @@ -78,9 +78,9 @@ class Google_Service_Bigquery_Resource_Models extends Google_Service_Resource /** * Patch specific fields in the specified model. (models.patch) * - * @param string $projectId Project ID of the model to patch. - * @param string $datasetId Dataset ID of the model to patch. - * @param string $modelId Model ID of the model to patch. + * @param string $projectId Required. Project ID of the model to patch. + * @param string $datasetId Required. Dataset ID of the model to patch. + * @param string $modelId Required. Model ID of the model to patch. * @param Google_Service_Bigquery_Model $postBody * @param array $optParams Optional parameters. * @return Google_Service_Bigquery_Model diff --git a/vendor/google/apiclient-services/src/Google/Service/Bigquery/Resource/Routines.php b/vendor/google/apiclient-services/src/Google/Service/Bigquery/Resource/Routines.php index 1f79621..f66200d 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Bigquery/Resource/Routines.php +++ b/vendor/google/apiclient-services/src/Google/Service/Bigquery/Resource/Routines.php @@ -29,9 +29,9 @@ class Google_Service_Bigquery_Resource_Routines extends Google_Service_Resource * Deletes the routine specified by routineId from the dataset. * (routines.delete) * - * @param string $projectId Project ID of the routine to delete - * @param string $datasetId Dataset ID of the routine to delete - * @param string $routineId Routine ID of the routine to delete + * @param string $projectId Required. Project ID of the routine to delete + * @param string $datasetId Required. Dataset ID of the routine to delete + * @param string $routineId Required. Routine ID of the routine to delete * @param array $optParams Optional parameters. */ public function delete($projectId, $datasetId, $routineId, $optParams = array()) @@ -43,9 +43,9 @@ class Google_Service_Bigquery_Resource_Routines extends Google_Service_Resource /** * Gets the specified routine resource by routine ID. (routines.get) * - * @param string $projectId Project ID of the requested routine - * @param string $datasetId Dataset ID of the requested routine - * @param string $routineId Routine ID of the requested routine + * @param string $projectId Required. Project ID of the requested routine + * @param string $datasetId Required. Dataset ID of the requested routine + * @param string $routineId Required. Routine ID of the requested routine * @param array $optParams Optional parameters. * * @opt_param string fieldMask If set, only the Routine fields in the field mask @@ -61,8 +61,8 @@ class Google_Service_Bigquery_Resource_Routines extends Google_Service_Resource /** * Creates a new routine in the dataset. (routines.insert) * - * @param string $projectId Project ID of the new routine - * @param string $datasetId Dataset ID of the new routine + * @param string $projectId Required. Project ID of the new routine + * @param string $datasetId Required. Dataset ID of the new routine * @param Google_Service_Bigquery_Routine $postBody * @param array $optParams Optional parameters. * @return Google_Service_Bigquery_Routine @@ -77,15 +77,15 @@ class Google_Service_Bigquery_Resource_Routines extends Google_Service_Resource * Lists all routines in the specified dataset. Requires the READER dataset * role. (routines.listRoutines) * - * @param string $projectId Project ID of the routines to list - * @param string $datasetId Dataset ID of the routines to list + * @param string $projectId Required. Project ID of the routines to list + * @param string $datasetId Required. Dataset ID of the routines to list * @param array $optParams Optional parameters. * - * @opt_param string pageToken Page token, returned by a previous call, to - * request the next page of results * @opt_param string maxResults The maximum number of results to return in a * single response page. Leverage the page tokens to iterate through the entire * collection. + * @opt_param string pageToken Page token, returned by a previous call, to + * request the next page of results * @return Google_Service_Bigquery_ListRoutinesResponse */ public function listRoutines($projectId, $datasetId, $optParams = array()) @@ -98,9 +98,9 @@ class Google_Service_Bigquery_Resource_Routines extends Google_Service_Resource * Updates information in an existing routine. The update method replaces the * entire Routine resource. (routines.update) * - * @param string $projectId Project ID of the routine to update - * @param string $datasetId Dataset ID of the routine to update - * @param string $routineId Routine ID of the routine to update + * @param string $projectId Required. Project ID of the routine to update + * @param string $datasetId Required. Dataset ID of the routine to update + * @param string $routineId Required. Routine ID of the routine to update * @param Google_Service_Bigquery_Routine $postBody * @param array $optParams Optional parameters. * @return Google_Service_Bigquery_Routine diff --git a/vendor/google/apiclient-services/src/Google/Service/Bigquery/Routine.php b/vendor/google/apiclient-services/src/Google/Service/Bigquery/Routine.php index e967554..7054043 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Bigquery/Routine.php +++ b/vendor/google/apiclient-services/src/Google/Service/Bigquery/Routine.php @@ -22,6 +22,7 @@ class Google_Service_Bigquery_Routine extends Google_Collection protected $argumentsDataType = 'array'; public $creationTime; public $definitionBody; + public $description; public $etag; public $importedLibraries; public $language; @@ -62,6 +63,14 @@ class Google_Service_Bigquery_Routine extends Google_Collection { return $this->definitionBody; } + public function setDescription($description) + { + $this->description = $description; + } + public function getDescription() + { + return $this->description; + } public function setEtag($etag) { $this->etag = $etag; diff --git a/vendor/google/apiclient-services/src/Google/Service/Bigquery/ScriptStackFrame.php b/vendor/google/apiclient-services/src/Google/Service/Bigquery/ScriptStackFrame.php new file mode 100644 index 0000000..2cd4780 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Bigquery/ScriptStackFrame.php @@ -0,0 +1,75 @@ +endColumn = $endColumn; + } + public function getEndColumn() + { + return $this->endColumn; + } + public function setEndLine($endLine) + { + $this->endLine = $endLine; + } + public function getEndLine() + { + return $this->endLine; + } + public function setProcedureId($procedureId) + { + $this->procedureId = $procedureId; + } + public function getProcedureId() + { + return $this->procedureId; + } + public function setStartColumn($startColumn) + { + $this->startColumn = $startColumn; + } + public function getStartColumn() + { + return $this->startColumn; + } + public function setStartLine($startLine) + { + $this->startLine = $startLine; + } + public function getStartLine() + { + return $this->startLine; + } + public function setText($text) + { + $this->text = $text; + } + public function getText() + { + return $this->text; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Bigquery/ScriptStatistics.php b/vendor/google/apiclient-services/src/Google/Service/Bigquery/ScriptStatistics.php new file mode 100644 index 0000000..74d425f --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Bigquery/ScriptStatistics.php @@ -0,0 +1,47 @@ +evaluationKind = $evaluationKind; + } + public function getEvaluationKind() + { + return $this->evaluationKind; + } + /** + * @param Google_Service_Bigquery_ScriptStackFrame + */ + public function setStackFrames($stackFrames) + { + $this->stackFrames = $stackFrames; + } + /** + * @return Google_Service_Bigquery_ScriptStackFrame + */ + public function getStackFrames() + { + return $this->stackFrames; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/BigtableAdmin.php b/vendor/google/apiclient-services/src/Google/Service/BigtableAdmin.php index 76379cf..b58d6f5 100644 --- a/vendor/google/apiclient-services/src/Google/Service/BigtableAdmin.php +++ b/vendor/google/apiclient-services/src/Google/Service/BigtableAdmin.php @@ -136,10 +136,6 @@ class Google_Service_BigtableAdmin extends Google_Service 'type' => 'string', 'required' => true, ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -148,6 +144,10 @@ class Google_Service_BigtableAdmin extends Google_Service 'location' => 'query', 'type' => 'integer', ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ), ) @@ -487,6 +487,16 @@ class Google_Service_BigtableAdmin extends Google_Service 'type' => 'string', ), ), + ),'getIamPolicy' => array( + 'path' => 'v2/{+resource}:getIamPolicy', + 'httpMethod' => 'POST', + 'parameters' => array( + 'resource' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), ),'list' => array( 'path' => 'v2/{+parent}/tables', 'httpMethod' => 'GET', @@ -519,6 +529,26 @@ class Google_Service_BigtableAdmin extends Google_Service 'required' => true, ), ), + ),'setIamPolicy' => array( + 'path' => 'v2/{+resource}:setIamPolicy', + 'httpMethod' => 'POST', + 'parameters' => array( + 'resource' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'testIamPermissions' => array( + 'path' => 'v2/{+resource}:testIamPermissions', + 'httpMethod' => 'POST', + 'parameters' => array( + 'resource' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), ), ) ) diff --git a/vendor/google/apiclient-services/src/Google/Service/BigtableAdmin/GetIamPolicyRequest.php b/vendor/google/apiclient-services/src/Google/Service/BigtableAdmin/GetIamPolicyRequest.php index 86500e9..55de3be 100644 --- a/vendor/google/apiclient-services/src/Google/Service/BigtableAdmin/GetIamPolicyRequest.php +++ b/vendor/google/apiclient-services/src/Google/Service/BigtableAdmin/GetIamPolicyRequest.php @@ -17,4 +17,21 @@ class Google_Service_BigtableAdmin_GetIamPolicyRequest extends Google_Model { + protected $optionsType = 'Google_Service_BigtableAdmin_GetPolicyOptions'; + protected $optionsDataType = ''; + + /** + * @param Google_Service_BigtableAdmin_GetPolicyOptions + */ + public function setOptions(Google_Service_BigtableAdmin_GetPolicyOptions $options) + { + $this->options = $options; + } + /** + * @return Google_Service_BigtableAdmin_GetPolicyOptions + */ + public function getOptions() + { + return $this->options; + } } diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GetPolicyOptions.php b/vendor/google/apiclient-services/src/Google/Service/BigtableAdmin/GetPolicyOptions.php similarity index 92% rename from vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GetPolicyOptions.php rename to vendor/google/apiclient-services/src/Google/Service/BigtableAdmin/GetPolicyOptions.php index 2c96506..5823fef 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GetPolicyOptions.php +++ b/vendor/google/apiclient-services/src/Google/Service/BigtableAdmin/GetPolicyOptions.php @@ -15,7 +15,7 @@ * the License. */ -class Google_Service_CloudHealthcare_GetPolicyOptions extends Google_Model +class Google_Service_BigtableAdmin_GetPolicyOptions extends Google_Model { public $requestedPolicyVersion; diff --git a/vendor/google/apiclient-services/src/Google/Service/BigtableAdmin/Resource/OperationsProjectsOperations.php b/vendor/google/apiclient-services/src/Google/Service/BigtableAdmin/Resource/OperationsProjectsOperations.php index ec9edba..72f1507 100644 --- a/vendor/google/apiclient-services/src/Google/Service/BigtableAdmin/Resource/OperationsProjectsOperations.php +++ b/vendor/google/apiclient-services/src/Google/Service/BigtableAdmin/Resource/OperationsProjectsOperations.php @@ -41,9 +41,9 @@ class Google_Service_BigtableAdmin_Resource_OperationsProjectsOperations extends * @param string $name The name of the operation's parent resource. * @param array $optParams Optional parameters. * - * @opt_param string filter The standard list filter. * @opt_param string pageToken The standard list page token. * @opt_param int pageSize The standard list page size. + * @opt_param string filter The standard list filter. * @return Google_Service_BigtableAdmin_ListOperationsResponse */ public function listOperationsProjectsOperations($name, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/BigtableAdmin/Resource/ProjectsInstancesTables.php b/vendor/google/apiclient-services/src/Google/Service/BigtableAdmin/Resource/ProjectsInstancesTables.php index d45f195..a71391a 100644 --- a/vendor/google/apiclient-services/src/Google/Service/BigtableAdmin/Resource/ProjectsInstancesTables.php +++ b/vendor/google/apiclient-services/src/Google/Service/BigtableAdmin/Resource/ProjectsInstancesTables.php @@ -126,6 +126,24 @@ class Google_Service_BigtableAdmin_Resource_ProjectsInstancesTables extends Goog $params = array_merge($params, $optParams); return $this->call('get', array($params), "Google_Service_BigtableAdmin_Table"); } + /** + * Gets the access control policy for an instance resource. Returns an empty + * policy if an table exists but does not have a policy set. + * (tables.getIamPolicy) + * + * @param string $resource REQUIRED: The resource for which the policy is being + * requested. See the operation documentation for the appropriate value for this + * field. + * @param Google_Service_BigtableAdmin_GetIamPolicyRequest $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_BigtableAdmin_Policy + */ + public function getIamPolicy($resource, Google_Service_BigtableAdmin_GetIamPolicyRequest $postBody, $optParams = array()) + { + $params = array('resource' => $resource, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('getIamPolicy', array($params), "Google_Service_BigtableAdmin_Policy"); + } /** * Lists all tables served from a specified instance. * (tables.listProjectsInstancesTables) @@ -173,4 +191,38 @@ class Google_Service_BigtableAdmin_Resource_ProjectsInstancesTables extends Goog $params = array_merge($params, $optParams); return $this->call('modifyColumnFamilies', array($params), "Google_Service_BigtableAdmin_Table"); } + /** + * Sets the access control policy on a table resource. Replaces any existing + * policy. (tables.setIamPolicy) + * + * @param string $resource REQUIRED: The resource for which the policy is being + * specified. See the operation documentation for the appropriate value for this + * field. + * @param Google_Service_BigtableAdmin_SetIamPolicyRequest $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_BigtableAdmin_Policy + */ + public function setIamPolicy($resource, Google_Service_BigtableAdmin_SetIamPolicyRequest $postBody, $optParams = array()) + { + $params = array('resource' => $resource, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('setIamPolicy', array($params), "Google_Service_BigtableAdmin_Policy"); + } + /** + * Returns permissions that the caller has on the specified table resource. + * (tables.testIamPermissions) + * + * @param string $resource REQUIRED: The resource for which the policy detail is + * being requested. See the operation documentation for the appropriate value + * for this field. + * @param Google_Service_BigtableAdmin_TestIamPermissionsRequest $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_BigtableAdmin_TestIamPermissionsResponse + */ + public function testIamPermissions($resource, Google_Service_BigtableAdmin_TestIamPermissionsRequest $postBody, $optParams = array()) + { + $params = array('resource' => $resource, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('testIamPermissions', array($params), "Google_Service_BigtableAdmin_TestIamPermissionsResponse"); + } } diff --git a/vendor/google/apiclient-services/src/Google/Service/BinaryAuthorization.php b/vendor/google/apiclient-services/src/Google/Service/BinaryAuthorization.php index 40869bc..9fb6275 100644 --- a/vendor/google/apiclient-services/src/Google/Service/BinaryAuthorization.php +++ b/vendor/google/apiclient-services/src/Google/Service/BinaryAuthorization.php @@ -16,7 +16,7 @@ */ /** - * Service definition for BinaryAuthorization (v1beta1). + * Service definition for BinaryAuthorization (v1). * *

* The management interface for Binary Authorization, a system providing policy @@ -51,7 +51,7 @@ class Google_Service_BinaryAuthorization extends Google_Service $this->rootUrl = $rootUrl ?: 'https://binaryauthorization.googleapis.com/'; $this->servicePath = ''; $this->batchPath = 'batch'; - $this->version = 'v1beta1'; + $this->version = 'v1'; $this->serviceName = 'binaryauthorization'; $this->projects = new Google_Service_BinaryAuthorization_Resource_Projects( @@ -61,7 +61,7 @@ class Google_Service_BinaryAuthorization extends Google_Service array( 'methods' => array( 'getPolicy' => array( - 'path' => 'v1beta1/{+name}', + 'path' => 'v1/{+name}', 'httpMethod' => 'GET', 'parameters' => array( 'name' => array( @@ -71,7 +71,7 @@ class Google_Service_BinaryAuthorization extends Google_Service ), ), ),'updatePolicy' => array( - 'path' => 'v1beta1/{+name}', + 'path' => 'v1/{+name}', 'httpMethod' => 'PUT', 'parameters' => array( 'name' => array( @@ -91,7 +91,7 @@ class Google_Service_BinaryAuthorization extends Google_Service array( 'methods' => array( 'create' => array( - 'path' => 'v1beta1/{+parent}/attestors', + 'path' => 'v1/{+parent}/attestors', 'httpMethod' => 'POST', 'parameters' => array( 'parent' => array( @@ -105,7 +105,7 @@ class Google_Service_BinaryAuthorization extends Google_Service ), ), ),'delete' => array( - 'path' => 'v1beta1/{+name}', + 'path' => 'v1/{+name}', 'httpMethod' => 'DELETE', 'parameters' => array( 'name' => array( @@ -115,7 +115,7 @@ class Google_Service_BinaryAuthorization extends Google_Service ), ), ),'get' => array( - 'path' => 'v1beta1/{+name}', + 'path' => 'v1/{+name}', 'httpMethod' => 'GET', 'parameters' => array( 'name' => array( @@ -125,7 +125,7 @@ class Google_Service_BinaryAuthorization extends Google_Service ), ), ),'getIamPolicy' => array( - 'path' => 'v1beta1/{+resource}:getIamPolicy', + 'path' => 'v1/{+resource}:getIamPolicy', 'httpMethod' => 'GET', 'parameters' => array( 'resource' => array( @@ -139,7 +139,7 @@ class Google_Service_BinaryAuthorization extends Google_Service ), ), ),'list' => array( - 'path' => 'v1beta1/{+parent}/attestors', + 'path' => 'v1/{+parent}/attestors', 'httpMethod' => 'GET', 'parameters' => array( 'parent' => array( @@ -157,7 +157,7 @@ class Google_Service_BinaryAuthorization extends Google_Service ), ), ),'setIamPolicy' => array( - 'path' => 'v1beta1/{+resource}:setIamPolicy', + 'path' => 'v1/{+resource}:setIamPolicy', 'httpMethod' => 'POST', 'parameters' => array( 'resource' => array( @@ -167,7 +167,7 @@ class Google_Service_BinaryAuthorization extends Google_Service ), ), ),'testIamPermissions' => array( - 'path' => 'v1beta1/{+resource}:testIamPermissions', + 'path' => 'v1/{+resource}:testIamPermissions', 'httpMethod' => 'POST', 'parameters' => array( 'resource' => array( @@ -177,7 +177,7 @@ class Google_Service_BinaryAuthorization extends Google_Service ), ), ),'update' => array( - 'path' => 'v1beta1/{+name}', + 'path' => 'v1/{+name}', 'httpMethod' => 'PUT', 'parameters' => array( 'name' => array( @@ -197,7 +197,7 @@ class Google_Service_BinaryAuthorization extends Google_Service array( 'methods' => array( 'getIamPolicy' => array( - 'path' => 'v1beta1/{+resource}:getIamPolicy', + 'path' => 'v1/{+resource}:getIamPolicy', 'httpMethod' => 'GET', 'parameters' => array( 'resource' => array( @@ -211,7 +211,7 @@ class Google_Service_BinaryAuthorization extends Google_Service ), ), ),'setIamPolicy' => array( - 'path' => 'v1beta1/{+resource}:setIamPolicy', + 'path' => 'v1/{+resource}:setIamPolicy', 'httpMethod' => 'POST', 'parameters' => array( 'resource' => array( @@ -221,7 +221,7 @@ class Google_Service_BinaryAuthorization extends Google_Service ), ), ),'testIamPermissions' => array( - 'path' => 'v1beta1/{+resource}:testIamPermissions', + 'path' => 'v1/{+resource}:testIamPermissions', 'httpMethod' => 'POST', 'parameters' => array( 'resource' => array( diff --git a/vendor/google/apiclient-services/src/Google/Service/BinaryAuthorization/Attestor.php b/vendor/google/apiclient-services/src/Google/Service/BinaryAuthorization/Attestor.php index c5eff75..1289ab5 100644 --- a/vendor/google/apiclient-services/src/Google/Service/BinaryAuthorization/Attestor.php +++ b/vendor/google/apiclient-services/src/Google/Service/BinaryAuthorization/Attestor.php @@ -20,8 +20,8 @@ class Google_Service_BinaryAuthorization_Attestor extends Google_Model public $description; public $name; public $updateTime; - protected $userOwnedDrydockNoteType = 'Google_Service_BinaryAuthorization_UserOwnedDrydockNote'; - protected $userOwnedDrydockNoteDataType = ''; + protected $userOwnedGrafeasNoteType = 'Google_Service_BinaryAuthorization_UserOwnedGrafeasNote'; + protected $userOwnedGrafeasNoteDataType = ''; public function setDescription($description) { @@ -48,17 +48,17 @@ class Google_Service_BinaryAuthorization_Attestor extends Google_Model return $this->updateTime; } /** - * @param Google_Service_BinaryAuthorization_UserOwnedDrydockNote + * @param Google_Service_BinaryAuthorization_UserOwnedGrafeasNote */ - public function setUserOwnedDrydockNote(Google_Service_BinaryAuthorization_UserOwnedDrydockNote $userOwnedDrydockNote) + public function setUserOwnedGrafeasNote(Google_Service_BinaryAuthorization_UserOwnedGrafeasNote $userOwnedGrafeasNote) { - $this->userOwnedDrydockNote = $userOwnedDrydockNote; + $this->userOwnedGrafeasNote = $userOwnedGrafeasNote; } /** - * @return Google_Service_BinaryAuthorization_UserOwnedDrydockNote + * @return Google_Service_BinaryAuthorization_UserOwnedGrafeasNote */ - public function getUserOwnedDrydockNote() + public function getUserOwnedGrafeasNote() { - return $this->userOwnedDrydockNote; + return $this->userOwnedGrafeasNote; } } diff --git a/vendor/google/apiclient-services/src/Google/Service/BinaryAuthorization/Resource/ProjectsAttestors.php b/vendor/google/apiclient-services/src/Google/Service/BinaryAuthorization/Resource/ProjectsAttestors.php index 72f0b7b..f9004ff 100644 --- a/vendor/google/apiclient-services/src/Google/Service/BinaryAuthorization/Resource/ProjectsAttestors.php +++ b/vendor/google/apiclient-services/src/Google/Service/BinaryAuthorization/Resource/ProjectsAttestors.php @@ -83,8 +83,14 @@ class Google_Service_BinaryAuthorization_Resource_ProjectsAttestors extends Goog * @param array $optParams Optional parameters. * * @opt_param int options.requestedPolicyVersion Optional. The policy format - * version to be returned. Acceptable values are 0, 1, and 3. If the value is 0, - * or the field is omitted, policy format version 1 will be returned. + * version to be returned. + * + * Valid values are 0, 1, and 3. Requests specifying an invalid value will be + * rejected. + * + * Requests for policies with any conditional bindings must specify version 3. + * Policies without any conditional bindings may specify any valid value or + * leave the field unset. * @return Google_Service_BinaryAuthorization_IamPolicy */ public function getIamPolicy($resource, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/BinaryAuthorization/Resource/ProjectsPolicy.php b/vendor/google/apiclient-services/src/Google/Service/BinaryAuthorization/Resource/ProjectsPolicy.php index 37dabbc..7d72838 100644 --- a/vendor/google/apiclient-services/src/Google/Service/BinaryAuthorization/Resource/ProjectsPolicy.php +++ b/vendor/google/apiclient-services/src/Google/Service/BinaryAuthorization/Resource/ProjectsPolicy.php @@ -35,8 +35,14 @@ class Google_Service_BinaryAuthorization_Resource_ProjectsPolicy extends Google_ * @param array $optParams Optional parameters. * * @opt_param int options.requestedPolicyVersion Optional. The policy format - * version to be returned. Acceptable values are 0, 1, and 3. If the value is 0, - * or the field is omitted, policy format version 1 will be returned. + * version to be returned. + * + * Valid values are 0, 1, and 3. Requests specifying an invalid value will be + * rejected. + * + * Requests for policies with any conditional bindings must specify version 3. + * Policies without any conditional bindings may specify any valid value or + * leave the field unset. * @return Google_Service_BinaryAuthorization_IamPolicy */ public function getIamPolicy($resource, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/BinaryAuthorization/UserOwnedDrydockNote.php b/vendor/google/apiclient-services/src/Google/Service/BinaryAuthorization/UserOwnedGrafeasNote.php similarity index 96% rename from vendor/google/apiclient-services/src/Google/Service/BinaryAuthorization/UserOwnedDrydockNote.php rename to vendor/google/apiclient-services/src/Google/Service/BinaryAuthorization/UserOwnedGrafeasNote.php index 84eb24b..cd1de29 100644 --- a/vendor/google/apiclient-services/src/Google/Service/BinaryAuthorization/UserOwnedDrydockNote.php +++ b/vendor/google/apiclient-services/src/Google/Service/BinaryAuthorization/UserOwnedGrafeasNote.php @@ -15,7 +15,7 @@ * the License. */ -class Google_Service_BinaryAuthorization_UserOwnedDrydockNote extends Google_Collection +class Google_Service_BinaryAuthorization_UserOwnedGrafeasNote extends Google_Collection { protected $collection_key = 'publicKeys'; public $delegationServiceAccountEmail; diff --git a/vendor/google/apiclient-services/src/Google/Service/Blogger/Resource/BlogUserInfos.php b/vendor/google/apiclient-services/src/Google/Service/Blogger/Resource/BlogUserInfos.php index b6bccb7..2597326 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Blogger/Resource/BlogUserInfos.php +++ b/vendor/google/apiclient-services/src/Google/Service/Blogger/Resource/BlogUserInfos.php @@ -29,7 +29,7 @@ class Google_Service_Blogger_Resource_BlogUserInfos extends Google_Service_Resou * Gets one blog and user info pair by blogId and userId. (blogUserInfos.get) * * @param string $userId ID of the user whose blogs are to be fetched. Either - * the word 'self' (sans quote marks) or the user's profile identifier. + * the word 'self' or the user's profile identifier. * @param string $blogId The ID of the blog to get. * @param array $optParams Optional parameters. * diff --git a/vendor/google/apiclient-services/src/Google/Service/Blogger/Resource/Blogs.php b/vendor/google/apiclient-services/src/Google/Service/Blogger/Resource/Blogs.php index 7d250fd..b823834 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Blogger/Resource/Blogs.php +++ b/vendor/google/apiclient-services/src/Google/Service/Blogger/Resource/Blogs.php @@ -63,7 +63,7 @@ class Google_Service_Blogger_Resource_Blogs extends Google_Service_Resource * Retrieves a list of blogs, possibly filtered. (blogs.listByUser) * * @param string $userId ID of the user whose blogs are to be fetched. Either - * the word 'self' (sans quote marks) or the user's profile identifier. + * the word 'self' or the user's profile identifier. * @param array $optParams Optional parameters. * * @opt_param bool fetchUserInfo Whether the response is a list of blogs with diff --git a/vendor/google/apiclient-services/src/Google/Service/Blogger/Resource/PostUserInfos.php b/vendor/google/apiclient-services/src/Google/Service/Blogger/Resource/PostUserInfos.php index 8d849e4..836af15 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Blogger/Resource/PostUserInfos.php +++ b/vendor/google/apiclient-services/src/Google/Service/Blogger/Resource/PostUserInfos.php @@ -31,8 +31,7 @@ class Google_Service_Blogger_Resource_PostUserInfos extends Google_Service_Resou * to the user. (postUserInfos.get) * * @param string $userId ID of the user for the per-user information to be - * fetched. Either the word 'self' (sans quote marks) or the user's profile - * identifier. + * fetched. Either the word 'self' or the user's profile identifier. * @param string $blogId The ID of the blog. * @param string $postId The ID of the post to get. * @param array $optParams Optional parameters. @@ -53,8 +52,7 @@ class Google_Service_Blogger_Resource_PostUserInfos extends Google_Service_Resou * rights, specific to the user. (postUserInfos.listPostUserInfos) * * @param string $userId ID of the user for the per-user information to be - * fetched. Either the word 'self' (sans quote marks) or the user's profile - * identifier. + * fetched. Either the word 'self' or the user's profile identifier. * @param string $blogId ID of the blog to fetch posts from. * @param array $optParams Optional parameters. * diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudAsset.php b/vendor/google/apiclient-services/src/Google/Service/CloudAsset.php index 397f6fa..6571527 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudAsset.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudAsset.php @@ -87,14 +87,6 @@ class Google_Service_CloudAsset extends Google_Service 'type' => 'string', 'required' => true, ), - 'readTimeWindow.endTime' => array( - 'location' => 'query', - 'type' => 'string', - ), - 'readTimeWindow.startTime' => array( - 'location' => 'query', - 'type' => 'string', - ), 'assetNames' => array( 'location' => 'query', 'type' => 'string', @@ -104,6 +96,14 @@ class Google_Service_CloudAsset extends Google_Service 'location' => 'query', 'type' => 'string', ), + 'readTimeWindow.endTime' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'readTimeWindow.startTime' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'exportAssets' => array( 'path' => 'v1/{+parent}:exportAssets', diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudAsset/Asset.php b/vendor/google/apiclient-services/src/Google/Service/CloudAsset/Asset.php index 845e7f1..b3a3a1a 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudAsset/Asset.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudAsset/Asset.php @@ -22,6 +22,7 @@ class Google_Service_CloudAsset_Asset extends Google_Collection protected $accessLevelDataType = ''; protected $accessPolicyType = 'Google_Service_CloudAsset_GoogleIdentityAccesscontextmanagerV1AccessPolicy'; protected $accessPolicyDataType = ''; + public $ancestors; public $assetType; protected $iamPolicyType = 'Google_Service_CloudAsset_Policy'; protected $iamPolicyDataType = ''; @@ -61,6 +62,14 @@ class Google_Service_CloudAsset_Asset extends Google_Collection { return $this->accessPolicy; } + public function setAncestors($ancestors) + { + $this->ancestors = $ancestors; + } + public function getAncestors() + { + return $this->ancestors; + } public function setAssetType($assetType) { $this->assetType = $assetType; diff --git a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1InputDataset.php b/vendor/google/apiclient-services/src/Google/Service/CloudAsset/BigQueryDestination.php similarity index 67% rename from vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1InputDataset.php rename to vendor/google/apiclient-services/src/Google/Service/CloudAsset/BigQueryDestination.php index 6fa7dfe..4ae014b 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1InputDataset.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudAsset/BigQueryDestination.php @@ -15,9 +15,11 @@ * the License. */ -class Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1InputDataset extends Google_Model +class Google_Service_CloudAsset_BigQueryDestination extends Google_Model { public $dataset; + public $force; + public $table; public function setDataset($dataset) { @@ -27,4 +29,20 @@ class Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1InputDataset extends { return $this->dataset; } + public function setForce($force) + { + $this->force = $force; + } + public function getForce() + { + return $this->force; + } + public function setTable($table) + { + $this->table = $table; + } + public function getTable() + { + return $this->table; + } } diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudAsset/OutputConfig.php b/vendor/google/apiclient-services/src/Google/Service/CloudAsset/OutputConfig.php index da31395..97aa426 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudAsset/OutputConfig.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudAsset/OutputConfig.php @@ -17,9 +17,25 @@ class Google_Service_CloudAsset_OutputConfig extends Google_Model { + protected $bigqueryDestinationType = 'Google_Service_CloudAsset_BigQueryDestination'; + protected $bigqueryDestinationDataType = ''; protected $gcsDestinationType = 'Google_Service_CloudAsset_GcsDestination'; protected $gcsDestinationDataType = ''; + /** + * @param Google_Service_CloudAsset_BigQueryDestination + */ + public function setBigqueryDestination(Google_Service_CloudAsset_BigQueryDestination $bigqueryDestination) + { + $this->bigqueryDestination = $bigqueryDestination; + } + /** + * @return Google_Service_CloudAsset_BigQueryDestination + */ + public function getBigqueryDestination() + { + return $this->bigqueryDestination; + } /** * @param Google_Service_CloudAsset_GcsDestination */ diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudAsset/Resource/V1.php b/vendor/google/apiclient-services/src/Google/Service/CloudAsset/Resource/V1.php index 78e0e4f..cbce4d9 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudAsset/Resource/V1.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudAsset/Resource/V1.php @@ -39,10 +39,6 @@ class Google_Service_CloudAsset_Resource_V1 extends Google_Service_Resource * "projects/12345"). * @param array $optParams Optional parameters. * - * @opt_param string readTimeWindow.endTime End time of the time window - * (inclusive). Current timestamp if not specified. - * @opt_param string readTimeWindow.startTime Start time of the time window - * (exclusive). * @opt_param string assetNames A list of the full names of the assets. For * example: `//compute.googleapis.com/projects/my_project_123/zones/zone1/instan * ces/instance1`. See [Resource Names](https://cloud.google.com/apis/design/res @@ -52,7 +48,11 @@ class Google_Service_CloudAsset_Resource_V1 extends Google_Service_Resource * * The request becomes a no-op if the asset name list is empty, and the max size * of the asset name list is 100 in one request. - * @opt_param string contentType Required. The content type. + * @opt_param string contentType Optional. The content type. + * @opt_param string readTimeWindow.endTime End time of the time window + * (inclusive). Current timestamp if not specified. + * @opt_param string readTimeWindow.startTime Start time of the time window + * (exclusive). * @return Google_Service_CloudAsset_BatchGetAssetsHistoryResponse */ public function batchGetAssetsHistory($parent, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudBuild.php b/vendor/google/apiclient-services/src/Google/Service/CloudBuild.php index 12572fb..68a5933 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudBuild.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudBuild.php @@ -88,6 +88,10 @@ class Google_Service_CloudBuild extends Google_Service 'type' => 'string', 'required' => true, ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -96,10 +100,6 @@ class Google_Service_CloudBuild extends Google_Service 'location' => 'query', 'type' => 'integer', ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), ), ), ) @@ -160,6 +160,10 @@ class Google_Service_CloudBuild extends Google_Service 'type' => 'string', 'required' => true, ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -168,10 +172,6 @@ class Google_Service_CloudBuild extends Google_Service 'location' => 'query', 'type' => 'integer', ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), ), ),'retry' => array( 'path' => 'v1/projects/{projectId}/builds/{id}:retry', diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudBuild/BuildTrigger.php b/vendor/google/apiclient-services/src/Google/Service/CloudBuild/BuildTrigger.php index a5ad2e2..4f0f332 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudBuild/BuildTrigger.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudBuild/BuildTrigger.php @@ -29,6 +29,7 @@ class Google_Service_CloudBuild_BuildTrigger extends Google_Collection public $id; public $ignoredFiles; public $includedFiles; + public $name; public $substitutions; public $tags; protected $triggerTemplateType = 'Google_Service_CloudBuild_RepoSource'; @@ -118,6 +119,14 @@ class Google_Service_CloudBuild_BuildTrigger extends Google_Collection { return $this->includedFiles; } + public function setName($name) + { + $this->name = $name; + } + public function getName() + { + return $this->name; + } public function setSubstitutions($substitutions) { $this->substitutions = $substitutions; diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudBuild/Resource/Operations.php b/vendor/google/apiclient-services/src/Google/Service/CloudBuild/Resource/Operations.php index ae748b0..9b6eb65 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudBuild/Resource/Operations.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudBuild/Resource/Operations.php @@ -77,9 +77,9 @@ class Google_Service_CloudBuild_Resource_Operations extends Google_Service_Resou * @param string $name The name of the operation's parent resource. * @param array $optParams Optional parameters. * + * @opt_param string filter The standard list filter. * @opt_param string pageToken The standard list page token. * @opt_param int pageSize The standard list page size. - * @opt_param string filter The standard list filter. * @return Google_Service_CloudBuild_ListOperationsResponse */ public function listOperations($name, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudBuild/Resource/ProjectsBuilds.php b/vendor/google/apiclient-services/src/Google/Service/CloudBuild/Resource/ProjectsBuilds.php index f2d82b1..9177a12 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudBuild/Resource/ProjectsBuilds.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudBuild/Resource/ProjectsBuilds.php @@ -84,10 +84,10 @@ class Google_Service_CloudBuild_Resource_ProjectsBuilds extends Google_Service_R * @param string $projectId ID of the project. * @param array $optParams Optional parameters. * + * @opt_param string filter The raw filter text to constrain the results. * @opt_param string pageToken Token to provide to skip to a particular spot in * the list. * @opt_param int pageSize Number of results to return in the list. - * @opt_param string filter The raw filter text to constrain the results. * @return Google_Service_CloudBuild_ListBuildsResponse */ public function listProjectsBuilds($projectId, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudComposer.php b/vendor/google/apiclient-services/src/Google/Service/CloudComposer.php index 8b2a0b8..97ec51a 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudComposer.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudComposer.php @@ -188,10 +188,6 @@ class Google_Service_CloudComposer extends Google_Service 'type' => 'string', 'required' => true, ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -200,6 +196,10 @@ class Google_Service_CloudComposer extends Google_Service 'location' => 'query', 'type' => 'integer', ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ), ) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudComposer/Resource/ProjectsLocationsOperations.php b/vendor/google/apiclient-services/src/Google/Service/CloudComposer/Resource/ProjectsLocationsOperations.php index 86aaf6f..c578489 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudComposer/Resource/ProjectsLocationsOperations.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudComposer/Resource/ProjectsLocationsOperations.php @@ -72,9 +72,9 @@ class Google_Service_CloudComposer_Resource_ProjectsLocationsOperations extends * @param string $name The name of the operation's parent resource. * @param array $optParams Optional parameters. * - * @opt_param string filter The standard list filter. * @opt_param string pageToken The standard list page token. * @opt_param int pageSize The standard list page size. + * @opt_param string filter The standard list filter. * @return Google_Service_CloudComposer_ListOperationsResponse */ public function listProjectsLocationsOperations($name, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudFilestore.php b/vendor/google/apiclient-services/src/Google/Service/CloudFilestore.php index 5d0ddc6..303b643 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudFilestore.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudFilestore.php @@ -78,6 +78,10 @@ class Google_Service_CloudFilestore extends Google_Service 'type' => 'string', 'required' => true, ), + 'pageSize' => array( + 'location' => 'query', + 'type' => 'integer', + ), 'filter' => array( 'location' => 'query', 'type' => 'string', @@ -86,10 +90,6 @@ class Google_Service_CloudFilestore extends Google_Service 'location' => 'query', 'type' => 'string', ), - 'pageSize' => array( - 'location' => 'query', - 'type' => 'integer', - ), ), ), ) @@ -144,6 +144,10 @@ class Google_Service_CloudFilestore extends Google_Service 'type' => 'string', 'required' => true, ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -156,10 +160,6 @@ class Google_Service_CloudFilestore extends Google_Service 'location' => 'query', 'type' => 'integer', ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), ), ),'patch' => array( 'path' => 'v1/{+name}', @@ -224,10 +224,6 @@ class Google_Service_CloudFilestore extends Google_Service 'type' => 'string', 'required' => true, ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -236,6 +232,10 @@ class Google_Service_CloudFilestore extends Google_Service 'location' => 'query', 'type' => 'integer', ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ), ) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudFilestore/GoogleCloudSaasacceleratorManagementProvidersV1MaintenanceSchedule.php b/vendor/google/apiclient-services/src/Google/Service/CloudFilestore/GoogleCloudSaasacceleratorManagementProvidersV1MaintenanceSchedule.php index 8702215..92e219e 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudFilestore/GoogleCloudSaasacceleratorManagementProvidersV1MaintenanceSchedule.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudFilestore/GoogleCloudSaasacceleratorManagementProvidersV1MaintenanceSchedule.php @@ -19,6 +19,7 @@ class Google_Service_CloudFilestore_GoogleCloudSaasacceleratorManagementProvider { public $canReschedule; public $endTime; + public $rolloutManagementPolicy; public $startTime; public function setCanReschedule($canReschedule) @@ -37,6 +38,14 @@ class Google_Service_CloudFilestore_GoogleCloudSaasacceleratorManagementProvider { return $this->endTime; } + public function setRolloutManagementPolicy($rolloutManagementPolicy) + { + $this->rolloutManagementPolicy = $rolloutManagementPolicy; + } + public function getRolloutManagementPolicy() + { + return $this->rolloutManagementPolicy; + } public function setStartTime($startTime) { $this->startTime = $startTime; diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudFilestore/Resource/ProjectsLocations.php b/vendor/google/apiclient-services/src/Google/Service/CloudFilestore/Resource/ProjectsLocations.php index ebbea14..7971779 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudFilestore/Resource/ProjectsLocations.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudFilestore/Resource/ProjectsLocations.php @@ -46,9 +46,9 @@ class Google_Service_CloudFilestore_Resource_ProjectsLocations extends Google_Se * applicable. * @param array $optParams Optional parameters. * + * @opt_param int pageSize The standard list page size. * @opt_param string filter The standard list filter. * @opt_param string pageToken The standard list page token. - * @opt_param int pageSize The standard list page size. * @return Google_Service_CloudFilestore_ListLocationsResponse */ public function listProjectsLocations($name, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudFilestore/Resource/ProjectsLocationsInstances.php b/vendor/google/apiclient-services/src/Google/Service/CloudFilestore/Resource/ProjectsLocationsInstances.php index 0441320..ca12273 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudFilestore/Resource/ProjectsLocationsInstances.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudFilestore/Resource/ProjectsLocationsInstances.php @@ -83,12 +83,12 @@ class Google_Service_CloudFilestore_Resource_ProjectsLocationsInstances extends * value. * @param array $optParams Optional parameters. * + * @opt_param string filter List filter. * @opt_param string pageToken The next_page_token value to use if there are * additional results to retrieve for this list request. * @opt_param string orderBy Sort results. Supported values are "name", "name * desc" or "" (unsorted). * @opt_param int pageSize The maximum number of items to return. - * @opt_param string filter List filter. * @return Google_Service_CloudFilestore_ListInstancesResponse */ public function listProjectsLocationsInstances($parent, $optParams = array()) @@ -107,7 +107,7 @@ class Google_Service_CloudFilestore_Resource_ProjectsLocationsInstances extends * * @opt_param string updateMask Mask of fields to update. At least one path * must be supplied in this field. The elements of the repeated paths field may - * only include these fields: "description" + * only include these fields: "description" "file_shares" "labels" * @return Google_Service_CloudFilestore_Operation */ public function patch($name, Google_Service_CloudFilestore_Instance $postBody, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudFilestore/Resource/ProjectsLocationsOperations.php b/vendor/google/apiclient-services/src/Google/Service/CloudFilestore/Resource/ProjectsLocationsOperations.php index a1a28f5..852ea37 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudFilestore/Resource/ProjectsLocationsOperations.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudFilestore/Resource/ProjectsLocationsOperations.php @@ -94,9 +94,9 @@ class Google_Service_CloudFilestore_Resource_ProjectsLocationsOperations extends * @param string $name The name of the operation's parent resource. * @param array $optParams Optional parameters. * - * @opt_param string filter The standard list filter. * @opt_param string pageToken The standard list page token. * @opt_param int pageSize The standard list page size. + * @opt_param string filter The standard list filter. * @return Google_Service_CloudFilestore_ListOperationsResponse */ public function listProjectsLocationsOperations($name, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudFunctions.php b/vendor/google/apiclient-services/src/Google/Service/CloudFunctions.php index 7a6780f..1d348f9 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudFunctions.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudFunctions.php @@ -201,6 +201,10 @@ class Google_Service_CloudFunctions extends Google_Service 'type' => 'string', 'required' => true, ), + 'options.requestedPolicyVersion' => array( + 'location' => 'query', + 'type' => 'integer', + ), ), ),'list' => array( 'path' => 'v1/{+parent}/functions', diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudFunctions/Resource/Operations.php b/vendor/google/apiclient-services/src/Google/Service/CloudFunctions/Resource/Operations.php index 89f7f30..4235311 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudFunctions/Resource/Operations.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudFunctions/Resource/Operations.php @@ -55,12 +55,17 @@ class Google_Service_CloudFunctions_Resource_Operations extends Google_Service_R * @param array $optParams Optional parameters. * * @opt_param string filter Required. A filter for matching the requested - * operations. The supported formats of filter are: To query for specific + * operations. The supported formats of filter are: To query for a specific * function: project:*,location:*,function:* To query for all of the latest * operations for a project: project:*,latest:true * @opt_param string name Must not be set. - * @opt_param string pageToken The standard list page token. - * @opt_param int pageSize The standard list page size. + * @opt_param string pageToken Token identifying which result to start with, + * which is returned by a previous list call. Pagination is only supported when + * querying for a specific function. + * @opt_param int pageSize The maximum number of records that should be + * returned. Requested page size cannot exceed 100. If not set, the default page + * size is 100. Pagination is only supported when querying for a specific + * function. * @return Google_Service_CloudFunctions_ListOperationsResponse */ public function listOperations($optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudFunctions/Resource/ProjectsLocationsFunctions.php b/vendor/google/apiclient-services/src/Google/Service/CloudFunctions/Resource/ProjectsLocationsFunctions.php index 59e031c..c743b3c 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudFunctions/Resource/ProjectsLocationsFunctions.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudFunctions/Resource/ProjectsLocationsFunctions.php @@ -32,7 +32,7 @@ class Google_Service_CloudFunctions_Resource_ProjectsLocationsFunctions extends * Limits](https://cloud.google.com/functions/quotas#rate_limits). * (functions.callProjectsLocationsFunctions) * - * @param string $name The name of the function to be called. + * @param string $name Required. The name of the function to be called. * @param Google_Service_CloudFunctions_CallFunctionRequest $postBody * @param array $optParams Optional parameters. * @return Google_Service_CloudFunctions_CallFunctionResponse @@ -48,8 +48,8 @@ class Google_Service_CloudFunctions_Resource_ProjectsLocationsFunctions extends * the specified project, the long running operation will return * `ALREADY_EXISTS` error. (functions.create) * - * @param string $location The project and location in which the function should - * be created, specified in the format `projects/locations` + * @param string $location Required. The project and location in which the + * function should be created, specified in the format `projects/locations` * @param Google_Service_CloudFunctions_CloudFunction $postBody * @param array $optParams Optional parameters. * @return Google_Service_CloudFunctions_Operation @@ -65,7 +65,8 @@ class Google_Service_CloudFunctions_Resource_ProjectsLocationsFunctions extends * given function is used by some trigger, the trigger will be updated to remove * this function. (functions.delete) * - * @param string $name The name of the function which should be deleted. + * @param string $name Required. The name of the function which should be + * deleted. * @param array $optParams Optional parameters. * @return Google_Service_CloudFunctions_Operation */ @@ -137,8 +138,8 @@ class Google_Service_CloudFunctions_Resource_ProjectsLocationsFunctions extends * Returns a function with the given name from the requested project. * (functions.get) * - * @param string $name The name of the function which details should be - * obtained. + * @param string $name Required. The name of the function which details should + * be obtained. * @param array $optParams Optional parameters. * @return Google_Service_CloudFunctions_CloudFunction */ @@ -156,6 +157,16 @@ class Google_Service_CloudFunctions_Resource_ProjectsLocationsFunctions extends * requested. See the operation documentation for the appropriate value for this * field. * @param array $optParams Optional parameters. + * + * @opt_param int options.requestedPolicyVersion Optional. The policy format + * version to be returned. + * + * Valid values are 0, 1, and 3. Requests specifying an invalid value will be + * rejected. + * + * Requests for policies with any conditional bindings must specify version 3. + * Policies without any conditional bindings may specify any valid value or + * leave the field unset. * @return Google_Service_CloudFunctions_Policy */ public function getIamPolicy($resource, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare.php index 20d7181..ac3e5cf 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare.php @@ -16,7 +16,7 @@ */ /** - * Service definition for CloudHealthcare (v1alpha2). + * Service definition for CloudHealthcare (v1beta1). * *

* Manage, store, and access healthcare data in Google Cloud Platform.

@@ -36,14 +36,11 @@ class Google_Service_CloudHealthcare extends Google_Service public $projects_locations; public $projects_locations_datasets; - public $projects_locations_datasets_annotationStores; - public $projects_locations_datasets_annotationStores_annotations; public $projects_locations_datasets_dicomStores; - public $projects_locations_datasets_dicomStores_dicomWeb; - public $projects_locations_datasets_dicomStores_dicomWeb_studies; - public $projects_locations_datasets_dicomStores_dicomWeb_studies_series; - public $projects_locations_datasets_dicomStores_dicomWeb_studies_series_instances; - public $projects_locations_datasets_dicomStores_dicomWeb_studies_series_instances_frames; + public $projects_locations_datasets_dicomStores_studies; + public $projects_locations_datasets_dicomStores_studies_series; + public $projects_locations_datasets_dicomStores_studies_series_instances; + public $projects_locations_datasets_dicomStores_studies_series_instances_frames; public $projects_locations_datasets_fhirStores; public $projects_locations_datasets_fhirStores_fhir; public $projects_locations_datasets_hl7V2Stores; @@ -62,7 +59,7 @@ class Google_Service_CloudHealthcare extends Google_Service $this->rootUrl = $rootUrl ?: 'https://healthcare.googleapis.com/'; $this->servicePath = ''; $this->batchPath = 'batch'; - $this->version = 'v1alpha2'; + $this->version = 'v1beta1'; $this->serviceName = 'healthcare'; $this->projects_locations = new Google_Service_CloudHealthcare_Resource_ProjectsLocations( @@ -72,7 +69,7 @@ class Google_Service_CloudHealthcare extends Google_Service array( 'methods' => array( 'get' => array( - 'path' => 'v1alpha2/{+name}', + 'path' => 'v1beta1/{+name}', 'httpMethod' => 'GET', 'parameters' => array( 'name' => array( @@ -82,7 +79,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'list' => array( - 'path' => 'v1alpha2/{+name}/locations', + 'path' => 'v1beta1/{+name}/locations', 'httpMethod' => 'GET', 'parameters' => array( 'name' => array( @@ -114,7 +111,7 @@ class Google_Service_CloudHealthcare extends Google_Service array( 'methods' => array( 'create' => array( - 'path' => 'v1alpha2/{+parent}/datasets', + 'path' => 'v1beta1/{+parent}/datasets', 'httpMethod' => 'POST', 'parameters' => array( 'parent' => array( @@ -128,7 +125,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'deidentify' => array( - 'path' => 'v1alpha2/{+sourceDataset}:deidentify', + 'path' => 'v1beta1/{+sourceDataset}:deidentify', 'httpMethod' => 'POST', 'parameters' => array( 'sourceDataset' => array( @@ -138,7 +135,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'delete' => array( - 'path' => 'v1alpha2/{+name}', + 'path' => 'v1beta1/{+name}', 'httpMethod' => 'DELETE', 'parameters' => array( 'name' => array( @@ -148,7 +145,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'get' => array( - 'path' => 'v1alpha2/{+name}', + 'path' => 'v1beta1/{+name}', 'httpMethod' => 'GET', 'parameters' => array( 'name' => array( @@ -158,7 +155,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'getIamPolicy' => array( - 'path' => 'v1alpha2/{+resource}:getIamPolicy', + 'path' => 'v1beta1/{+resource}:getIamPolicy', 'httpMethod' => 'GET', 'parameters' => array( 'resource' => array( @@ -172,7 +169,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'list' => array( - 'path' => 'v1alpha2/{+parent}/datasets', + 'path' => 'v1beta1/{+parent}/datasets', 'httpMethod' => 'GET', 'parameters' => array( 'parent' => array( @@ -190,7 +187,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'patch' => array( - 'path' => 'v1alpha2/{+name}', + 'path' => 'v1beta1/{+name}', 'httpMethod' => 'PATCH', 'parameters' => array( 'name' => array( @@ -204,7 +201,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'setIamPolicy' => array( - 'path' => 'v1alpha2/{+resource}:setIamPolicy', + 'path' => 'v1beta1/{+resource}:setIamPolicy', 'httpMethod' => 'POST', 'parameters' => array( 'resource' => array( @@ -214,7 +211,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'testIamPermissions' => array( - 'path' => 'v1alpha2/{+resource}:testIamPermissions', + 'path' => 'v1beta1/{+resource}:testIamPermissions', 'httpMethod' => 'POST', 'parameters' => array( 'resource' => array( @@ -227,192 +224,6 @@ class Google_Service_CloudHealthcare extends Google_Service ) ) ); - $this->projects_locations_datasets_annotationStores = new Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsAnnotationStores( - $this, - $this->serviceName, - 'annotationStores', - array( - 'methods' => array( - 'create' => array( - 'path' => 'v1alpha2/{+parent}/annotationStores', - 'httpMethod' => 'POST', - 'parameters' => array( - 'parent' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - 'annotationStoreId' => array( - 'location' => 'query', - 'type' => 'string', - ), - ), - ),'delete' => array( - 'path' => 'v1alpha2/{+name}', - 'httpMethod' => 'DELETE', - 'parameters' => array( - 'name' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - ), - ),'get' => array( - 'path' => 'v1alpha2/{+name}', - 'httpMethod' => 'GET', - 'parameters' => array( - 'name' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - ), - ),'getIamPolicy' => array( - 'path' => 'v1alpha2/{+resource}:getIamPolicy', - 'httpMethod' => 'POST', - 'parameters' => array( - 'resource' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - ), - ),'list' => array( - 'path' => 'v1alpha2/{+parent}/annotationStores', - 'httpMethod' => 'GET', - 'parameters' => array( - 'parent' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), - 'pageToken' => array( - 'location' => 'query', - 'type' => 'string', - ), - 'pageSize' => array( - 'location' => 'query', - 'type' => 'integer', - ), - ), - ),'patch' => array( - 'path' => 'v1alpha2/{+name}', - 'httpMethod' => 'PATCH', - 'parameters' => array( - 'name' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - 'updateMask' => array( - 'location' => 'query', - 'type' => 'string', - ), - ), - ),'setIamPolicy' => array( - 'path' => 'v1alpha2/{+resource}:setIamPolicy', - 'httpMethod' => 'POST', - 'parameters' => array( - 'resource' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - ), - ),'testIamPermissions' => array( - 'path' => 'v1alpha2/{+resource}:testIamPermissions', - 'httpMethod' => 'POST', - 'parameters' => array( - 'resource' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - ), - ), - ) - ) - ); - $this->projects_locations_datasets_annotationStores_annotations = new Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsAnnotationStoresAnnotations( - $this, - $this->serviceName, - 'annotations', - array( - 'methods' => array( - 'create' => array( - 'path' => 'v1alpha2/{+parent}/annotations', - 'httpMethod' => 'POST', - 'parameters' => array( - 'parent' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - ), - ),'delete' => array( - 'path' => 'v1alpha2/{+name}', - 'httpMethod' => 'DELETE', - 'parameters' => array( - 'name' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - ), - ),'get' => array( - 'path' => 'v1alpha2/{+name}', - 'httpMethod' => 'GET', - 'parameters' => array( - 'name' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - ), - ),'list' => array( - 'path' => 'v1alpha2/{+parent}/annotations', - 'httpMethod' => 'GET', - 'parameters' => array( - 'parent' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - 'pageToken' => array( - 'location' => 'query', - 'type' => 'string', - ), - 'pageSize' => array( - 'location' => 'query', - 'type' => 'integer', - ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), - ), - ),'patch' => array( - 'path' => 'v1alpha2/{+name}', - 'httpMethod' => 'PATCH', - 'parameters' => array( - 'name' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - 'updateMask' => array( - 'location' => 'query', - 'type' => 'string', - ), - ), - ), - ) - ) - ); $this->projects_locations_datasets_dicomStores = new Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsDicomStores( $this, $this->serviceName, @@ -420,7 +231,7 @@ class Google_Service_CloudHealthcare extends Google_Service array( 'methods' => array( 'create' => array( - 'path' => 'v1alpha2/{+parent}/dicomStores', + 'path' => 'v1beta1/{+parent}/dicomStores', 'httpMethod' => 'POST', 'parameters' => array( 'parent' => array( @@ -434,7 +245,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'delete' => array( - 'path' => 'v1alpha2/{+name}', + 'path' => 'v1beta1/{+name}', 'httpMethod' => 'DELETE', 'parameters' => array( 'name' => array( @@ -444,7 +255,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'export' => array( - 'path' => 'v1alpha2/{+name}:export', + 'path' => 'v1beta1/{+name}:export', 'httpMethod' => 'POST', 'parameters' => array( 'name' => array( @@ -454,7 +265,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'get' => array( - 'path' => 'v1alpha2/{+name}', + 'path' => 'v1beta1/{+name}', 'httpMethod' => 'GET', 'parameters' => array( 'name' => array( @@ -464,7 +275,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'getIamPolicy' => array( - 'path' => 'v1alpha2/{+resource}:getIamPolicy', + 'path' => 'v1beta1/{+resource}:getIamPolicy', 'httpMethod' => 'GET', 'parameters' => array( 'resource' => array( @@ -478,7 +289,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'import' => array( - 'path' => 'v1alpha2/{+name}:import', + 'path' => 'v1beta1/{+name}:import', 'httpMethod' => 'POST', 'parameters' => array( 'name' => array( @@ -488,7 +299,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'list' => array( - 'path' => 'v1alpha2/{+parent}/dicomStores', + 'path' => 'v1beta1/{+parent}/dicomStores', 'httpMethod' => 'GET', 'parameters' => array( 'parent' => array( @@ -510,7 +321,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'patch' => array( - 'path' => 'v1alpha2/{+name}', + 'path' => 'v1beta1/{+name}', 'httpMethod' => 'PATCH', 'parameters' => array( 'name' => array( @@ -523,38 +334,8 @@ class Google_Service_CloudHealthcare extends Google_Service 'type' => 'string', ), ), - ),'setIamPolicy' => array( - 'path' => 'v1alpha2/{+resource}:setIamPolicy', - 'httpMethod' => 'POST', - 'parameters' => array( - 'resource' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - ), - ),'testIamPermissions' => array( - 'path' => 'v1alpha2/{+resource}:testIamPermissions', - 'httpMethod' => 'POST', - 'parameters' => array( - 'resource' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - ), - ), - ) - ) - ); - $this->projects_locations_datasets_dicomStores_dicomWeb = new Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsDicomStoresDicomWeb( - $this, - $this->serviceName, - 'dicomWeb', - array( - 'methods' => array( - 'searchForInstances' => array( - 'path' => 'v1alpha2/{+parent}/dicomWeb/{+dicomWebPath}', + ),'searchForInstances' => array( + 'path' => 'v1beta1/{+parent}/dicomWeb/{+dicomWebPath}', 'httpMethod' => 'GET', 'parameters' => array( 'parent' => array( @@ -569,7 +350,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'searchForSeries' => array( - 'path' => 'v1alpha2/{+parent}/dicomWeb/{+dicomWebPath}', + 'path' => 'v1beta1/{+parent}/dicomWeb/{+dicomWebPath}', 'httpMethod' => 'GET', 'parameters' => array( 'parent' => array( @@ -584,7 +365,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'searchForStudies' => array( - 'path' => 'v1alpha2/{+parent}/dicomWeb/{+dicomWebPath}', + 'path' => 'v1beta1/{+parent}/dicomWeb/{+dicomWebPath}', 'httpMethod' => 'GET', 'parameters' => array( 'parent' => array( @@ -598,8 +379,18 @@ class Google_Service_CloudHealthcare extends Google_Service 'required' => true, ), ), + ),'setIamPolicy' => array( + 'path' => 'v1beta1/{+resource}:setIamPolicy', + 'httpMethod' => 'POST', + 'parameters' => array( + 'resource' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), ),'storeInstances' => array( - 'path' => 'v1alpha2/{+parent}/dicomWeb/{+dicomWebPath}', + 'path' => 'v1beta1/{+parent}/dicomWeb/{+dicomWebPath}', 'httpMethod' => 'POST', 'parameters' => array( 'parent' => array( @@ -613,18 +404,28 @@ class Google_Service_CloudHealthcare extends Google_Service 'required' => true, ), ), + ),'testIamPermissions' => array( + 'path' => 'v1beta1/{+resource}:testIamPermissions', + 'httpMethod' => 'POST', + 'parameters' => array( + 'resource' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), ), ) ) ); - $this->projects_locations_datasets_dicomStores_dicomWeb_studies = new Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsDicomStoresDicomWebStudies( + $this->projects_locations_datasets_dicomStores_studies = new Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsDicomStoresStudies( $this, $this->serviceName, 'studies', array( 'methods' => array( 'delete' => array( - 'path' => 'v1alpha2/{+parent}/dicomWeb/{+dicomWebPath}', + 'path' => 'v1beta1/{+parent}/dicomWeb/{+dicomWebPath}', 'httpMethod' => 'DELETE', 'parameters' => array( 'parent' => array( @@ -638,8 +439,8 @@ class Google_Service_CloudHealthcare extends Google_Service 'required' => true, ), ), - ),'metadata' => array( - 'path' => 'v1alpha2/{+parent}/dicomWeb/{+dicomWebPath}', + ),'retrieveMetadata' => array( + 'path' => 'v1beta1/{+parent}/dicomWeb/{+dicomWebPath}', 'httpMethod' => 'GET', 'parameters' => array( 'parent' => array( @@ -654,7 +455,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'retrieveStudy' => array( - 'path' => 'v1alpha2/{+parent}/dicomWeb/{+dicomWebPath}', + 'path' => 'v1beta1/{+parent}/dicomWeb/{+dicomWebPath}', 'httpMethod' => 'GET', 'parameters' => array( 'parent' => array( @@ -669,7 +470,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'searchForInstances' => array( - 'path' => 'v1alpha2/{+parent}/dicomWeb/{+dicomWebPath}', + 'path' => 'v1beta1/{+parent}/dicomWeb/{+dicomWebPath}', 'httpMethod' => 'GET', 'parameters' => array( 'parent' => array( @@ -684,7 +485,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'searchForSeries' => array( - 'path' => 'v1alpha2/{+parent}/dicomWeb/{+dicomWebPath}', + 'path' => 'v1beta1/{+parent}/dicomWeb/{+dicomWebPath}', 'httpMethod' => 'GET', 'parameters' => array( 'parent' => array( @@ -699,7 +500,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'storeInstances' => array( - 'path' => 'v1alpha2/{+parent}/dicomWeb/{+dicomWebPath}', + 'path' => 'v1beta1/{+parent}/dicomWeb/{+dicomWebPath}', 'httpMethod' => 'POST', 'parameters' => array( 'parent' => array( @@ -717,14 +518,14 @@ class Google_Service_CloudHealthcare extends Google_Service ) ) ); - $this->projects_locations_datasets_dicomStores_dicomWeb_studies_series = new Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsDicomStoresDicomWebStudiesSeries( + $this->projects_locations_datasets_dicomStores_studies_series = new Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsDicomStoresStudiesSeries( $this, $this->serviceName, 'series', array( 'methods' => array( 'delete' => array( - 'path' => 'v1alpha2/{+parent}/dicomWeb/{+dicomWebPath}', + 'path' => 'v1beta1/{+parent}/dicomWeb/{+dicomWebPath}', 'httpMethod' => 'DELETE', 'parameters' => array( 'parent' => array( @@ -738,8 +539,8 @@ class Google_Service_CloudHealthcare extends Google_Service 'required' => true, ), ), - ),'metadata' => array( - 'path' => 'v1alpha2/{+parent}/dicomWeb/{+dicomWebPath}', + ),'retrieveMetadata' => array( + 'path' => 'v1beta1/{+parent}/dicomWeb/{+dicomWebPath}', 'httpMethod' => 'GET', 'parameters' => array( 'parent' => array( @@ -754,7 +555,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'retrieveSeries' => array( - 'path' => 'v1alpha2/{+parent}/dicomWeb/{+dicomWebPath}', + 'path' => 'v1beta1/{+parent}/dicomWeb/{+dicomWebPath}', 'httpMethod' => 'GET', 'parameters' => array( 'parent' => array( @@ -769,7 +570,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'searchForInstances' => array( - 'path' => 'v1alpha2/{+parent}/dicomWeb/{+dicomWebPath}', + 'path' => 'v1beta1/{+parent}/dicomWeb/{+dicomWebPath}', 'httpMethod' => 'GET', 'parameters' => array( 'parent' => array( @@ -787,14 +588,14 @@ class Google_Service_CloudHealthcare extends Google_Service ) ) ); - $this->projects_locations_datasets_dicomStores_dicomWeb_studies_series_instances = new Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsDicomStoresDicomWebStudiesSeriesInstances( + $this->projects_locations_datasets_dicomStores_studies_series_instances = new Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsDicomStoresStudiesSeriesInstances( $this, $this->serviceName, 'instances', array( 'methods' => array( 'delete' => array( - 'path' => 'v1alpha2/{+parent}/dicomWeb/{+dicomWebPath}', + 'path' => 'v1beta1/{+parent}/dicomWeb/{+dicomWebPath}', 'httpMethod' => 'DELETE', 'parameters' => array( 'parent' => array( @@ -808,38 +609,38 @@ class Google_Service_CloudHealthcare extends Google_Service 'required' => true, ), ), - ),'metadata' => array( - 'path' => 'v1alpha2/{+parent}/dicomWeb/{+dicomWebPath}', - 'httpMethod' => 'GET', - 'parameters' => array( - 'parent' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - 'dicomWebPath' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - ), - ),'rendered' => array( - 'path' => 'v1alpha2/{+parent}/dicomWeb/{+dicomWebPath}', - 'httpMethod' => 'GET', - 'parameters' => array( - 'parent' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - 'dicomWebPath' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - ), ),'retrieveInstance' => array( - 'path' => 'v1alpha2/{+parent}/dicomWeb/{+dicomWebPath}', + 'path' => 'v1beta1/{+parent}/dicomWeb/{+dicomWebPath}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'dicomWebPath' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'retrieveMetadata' => array( + 'path' => 'v1beta1/{+parent}/dicomWeb/{+dicomWebPath}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'dicomWebPath' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'retrieveRendered' => array( + 'path' => 'v1beta1/{+parent}/dicomWeb/{+dicomWebPath}', 'httpMethod' => 'GET', 'parameters' => array( 'parent' => array( @@ -857,14 +658,14 @@ class Google_Service_CloudHealthcare extends Google_Service ) ) ); - $this->projects_locations_datasets_dicomStores_dicomWeb_studies_series_instances_frames = new Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsDicomStoresDicomWebStudiesSeriesInstancesFrames( + $this->projects_locations_datasets_dicomStores_studies_series_instances_frames = new Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsDicomStoresStudiesSeriesInstancesFrames( $this, $this->serviceName, 'frames', array( 'methods' => array( - 'rendered' => array( - 'path' => 'v1alpha2/{+parent}/dicomWeb/{+dicomWebPath}', + 'retrieveFrames' => array( + 'path' => 'v1beta1/{+parent}/dicomWeb/{+dicomWebPath}', 'httpMethod' => 'GET', 'parameters' => array( 'parent' => array( @@ -878,8 +679,8 @@ class Google_Service_CloudHealthcare extends Google_Service 'required' => true, ), ), - ),'retrieveFrames' => array( - 'path' => 'v1alpha2/{+parent}/dicomWeb/{+dicomWebPath}', + ),'retrieveRendered' => array( + 'path' => 'v1beta1/{+parent}/dicomWeb/{+dicomWebPath}', 'httpMethod' => 'GET', 'parameters' => array( 'parent' => array( @@ -903,18 +704,8 @@ class Google_Service_CloudHealthcare extends Google_Service 'fhirStores', array( 'methods' => array( - 'capabilities' => array( - 'path' => 'v1alpha2/{+name}/metadata', - 'httpMethod' => 'GET', - 'parameters' => array( - 'name' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - ), - ),'create' => array( - 'path' => 'v1alpha2/{+parent}/fhirStores', + 'create' => array( + 'path' => 'v1beta1/{+parent}/fhirStores', 'httpMethod' => 'POST', 'parameters' => array( 'parent' => array( @@ -928,7 +719,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'delete' => array( - 'path' => 'v1alpha2/{+name}', + 'path' => 'v1beta1/{+name}', 'httpMethod' => 'DELETE', 'parameters' => array( 'name' => array( @@ -938,7 +729,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'export' => array( - 'path' => 'v1alpha2/{+name}:export', + 'path' => 'v1beta1/{+name}:export', 'httpMethod' => 'POST', 'parameters' => array( 'name' => array( @@ -948,7 +739,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'get' => array( - 'path' => 'v1alpha2/{+name}', + 'path' => 'v1beta1/{+name}', 'httpMethod' => 'GET', 'parameters' => array( 'name' => array( @@ -958,7 +749,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'getIamPolicy' => array( - 'path' => 'v1alpha2/{+resource}:getIamPolicy', + 'path' => 'v1beta1/{+resource}:getIamPolicy', 'httpMethod' => 'GET', 'parameters' => array( 'resource' => array( @@ -972,7 +763,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'import' => array( - 'path' => 'v1alpha2/{+name}:import', + 'path' => 'v1beta1/{+name}:import', 'httpMethod' => 'POST', 'parameters' => array( 'name' => array( @@ -982,7 +773,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'list' => array( - 'path' => 'v1alpha2/{+parent}/fhirStores', + 'path' => 'v1beta1/{+parent}/fhirStores', 'httpMethod' => 'GET', 'parameters' => array( 'parent' => array( @@ -1004,7 +795,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'patch' => array( - 'path' => 'v1alpha2/{+name}', + 'path' => 'v1beta1/{+name}', 'httpMethod' => 'PATCH', 'parameters' => array( 'name' => array( @@ -1018,7 +809,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'setIamPolicy' => array( - 'path' => 'v1alpha2/{+resource}:setIamPolicy', + 'path' => 'v1beta1/{+resource}:setIamPolicy', 'httpMethod' => 'POST', 'parameters' => array( 'resource' => array( @@ -1028,7 +819,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'testIamPermissions' => array( - 'path' => 'v1alpha2/{+resource}:testIamPermissions', + 'path' => 'v1beta1/{+resource}:testIamPermissions', 'httpMethod' => 'POST', 'parameters' => array( 'resource' => array( @@ -1048,7 +839,7 @@ class Google_Service_CloudHealthcare extends Google_Service array( 'methods' => array( 'Observation-lastn' => array( - 'path' => 'v1alpha2/{+parent}/fhir/Observation/$lastn', + 'path' => 'v1beta1/{+parent}/fhir/Observation/$lastn', 'httpMethod' => 'GET', 'parameters' => array( 'parent' => array( @@ -1058,7 +849,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'Patient-everything' => array( - 'path' => 'v1alpha2/{+name}/$everything', + 'path' => 'v1beta1/{+name}/$everything', 'httpMethod' => 'GET', 'parameters' => array( 'name' => array( @@ -1066,17 +857,25 @@ class Google_Service_CloudHealthcare extends Google_Service 'type' => 'string', 'required' => true, ), - 'start' => array( + 'end' => array( 'location' => 'query', 'type' => 'string', ), - 'end' => array( + '_count' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'start' => array( 'location' => 'query', 'type' => 'string', ), ), ),'Resource-purge' => array( - 'path' => 'v1alpha2/{+name}/$purge', + 'path' => 'v1beta1/{+name}/$purge', 'httpMethod' => 'DELETE', 'parameters' => array( 'name' => array( @@ -1086,7 +885,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'capabilities' => array( - 'path' => 'v1alpha2/{+name}/fhir/metadata', + 'path' => 'v1beta1/{+name}/fhir/metadata', 'httpMethod' => 'GET', 'parameters' => array( 'name' => array( @@ -1096,7 +895,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'conditionalDelete' => array( - 'path' => 'v1alpha2/{+parent}/fhir/{+type}', + 'path' => 'v1beta1/{+parent}/fhir/{+type}', 'httpMethod' => 'DELETE', 'parameters' => array( 'parent' => array( @@ -1111,7 +910,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'conditionalPatch' => array( - 'path' => 'v1alpha2/{+parent}/fhir/{+type}', + 'path' => 'v1beta1/{+parent}/fhir/{+type}', 'httpMethod' => 'PATCH', 'parameters' => array( 'parent' => array( @@ -1126,7 +925,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'conditionalUpdate' => array( - 'path' => 'v1alpha2/{+parent}/fhir/{+type}', + 'path' => 'v1beta1/{+parent}/fhir/{+type}', 'httpMethod' => 'PUT', 'parameters' => array( 'parent' => array( @@ -1141,7 +940,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'create' => array( - 'path' => 'v1alpha2/{+parent}/fhir/{+type}', + 'path' => 'v1beta1/{+parent}/fhir/{+type}', 'httpMethod' => 'POST', 'parameters' => array( 'parent' => array( @@ -1156,7 +955,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'delete' => array( - 'path' => 'v1alpha2/{+name}', + 'path' => 'v1beta1/{+name}', 'httpMethod' => 'DELETE', 'parameters' => array( 'name' => array( @@ -1166,7 +965,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'executeBundle' => array( - 'path' => 'v1alpha2/{+parent}/fhir', + 'path' => 'v1beta1/{+parent}/fhir', 'httpMethod' => 'POST', 'parameters' => array( 'parent' => array( @@ -1176,7 +975,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'history' => array( - 'path' => 'v1alpha2/{+name}/_history', + 'path' => 'v1beta1/{+name}/_history', 'httpMethod' => 'GET', 'parameters' => array( 'name' => array( @@ -1184,10 +983,6 @@ class Google_Service_CloudHealthcare extends Google_Service 'type' => 'string', 'required' => true, ), - 'page' => array( - 'location' => 'query', - 'type' => 'string', - ), 'at' => array( 'location' => 'query', 'type' => 'string', @@ -1196,13 +991,21 @@ class Google_Service_CloudHealthcare extends Google_Service 'location' => 'query', 'type' => 'integer', ), + 'page' => array( + 'location' => 'query', + 'type' => 'string', + ), + '_page_token' => array( + 'location' => 'query', + 'type' => 'string', + ), 'since' => array( 'location' => 'query', 'type' => 'string', ), ), ),'patch' => array( - 'path' => 'v1alpha2/{+name}', + 'path' => 'v1beta1/{+name}', 'httpMethod' => 'PATCH', 'parameters' => array( 'name' => array( @@ -1212,7 +1015,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'read' => array( - 'path' => 'v1alpha2/{+name}', + 'path' => 'v1beta1/{+name}', 'httpMethod' => 'GET', 'parameters' => array( 'name' => array( @@ -1222,7 +1025,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'search' => array( - 'path' => 'v1alpha2/{+parent}/fhir/_search', + 'path' => 'v1beta1/{+parent}/fhir/_search', 'httpMethod' => 'POST', 'parameters' => array( 'parent' => array( @@ -1232,7 +1035,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'update' => array( - 'path' => 'v1alpha2/{+name}', + 'path' => 'v1beta1/{+name}', 'httpMethod' => 'PUT', 'parameters' => array( 'name' => array( @@ -1242,7 +1045,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'vread' => array( - 'path' => 'v1alpha2/{+name}', + 'path' => 'v1beta1/{+name}', 'httpMethod' => 'GET', 'parameters' => array( 'name' => array( @@ -1262,7 +1065,7 @@ class Google_Service_CloudHealthcare extends Google_Service array( 'methods' => array( 'create' => array( - 'path' => 'v1alpha2/{+parent}/hl7V2Stores', + 'path' => 'v1beta1/{+parent}/hl7V2Stores', 'httpMethod' => 'POST', 'parameters' => array( 'parent' => array( @@ -1276,7 +1079,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'delete' => array( - 'path' => 'v1alpha2/{+name}', + 'path' => 'v1beta1/{+name}', 'httpMethod' => 'DELETE', 'parameters' => array( 'name' => array( @@ -1286,7 +1089,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'get' => array( - 'path' => 'v1alpha2/{+name}', + 'path' => 'v1beta1/{+name}', 'httpMethod' => 'GET', 'parameters' => array( 'name' => array( @@ -1296,7 +1099,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'getIamPolicy' => array( - 'path' => 'v1alpha2/{+resource}:getIamPolicy', + 'path' => 'v1beta1/{+resource}:getIamPolicy', 'httpMethod' => 'GET', 'parameters' => array( 'resource' => array( @@ -1310,7 +1113,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'list' => array( - 'path' => 'v1alpha2/{+parent}/hl7V2Stores', + 'path' => 'v1beta1/{+parent}/hl7V2Stores', 'httpMethod' => 'GET', 'parameters' => array( 'parent' => array( @@ -1318,10 +1121,6 @@ class Google_Service_CloudHealthcare extends Google_Service 'type' => 'string', 'required' => true, ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -1330,9 +1129,13 @@ class Google_Service_CloudHealthcare extends Google_Service 'location' => 'query', 'type' => 'integer', ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'patch' => array( - 'path' => 'v1alpha2/{+name}', + 'path' => 'v1beta1/{+name}', 'httpMethod' => 'PATCH', 'parameters' => array( 'name' => array( @@ -1346,7 +1149,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'setIamPolicy' => array( - 'path' => 'v1alpha2/{+resource}:setIamPolicy', + 'path' => 'v1beta1/{+resource}:setIamPolicy', 'httpMethod' => 'POST', 'parameters' => array( 'resource' => array( @@ -1356,7 +1159,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'testIamPermissions' => array( - 'path' => 'v1alpha2/{+resource}:testIamPermissions', + 'path' => 'v1beta1/{+resource}:testIamPermissions', 'httpMethod' => 'POST', 'parameters' => array( 'resource' => array( @@ -1376,7 +1179,7 @@ class Google_Service_CloudHealthcare extends Google_Service array( 'methods' => array( 'create' => array( - 'path' => 'v1alpha2/{+parent}/messages', + 'path' => 'v1beta1/{+parent}/messages', 'httpMethod' => 'POST', 'parameters' => array( 'parent' => array( @@ -1386,7 +1189,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'delete' => array( - 'path' => 'v1alpha2/{+name}', + 'path' => 'v1beta1/{+name}', 'httpMethod' => 'DELETE', 'parameters' => array( 'name' => array( @@ -1396,7 +1199,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'get' => array( - 'path' => 'v1alpha2/{+name}', + 'path' => 'v1beta1/{+name}', 'httpMethod' => 'GET', 'parameters' => array( 'name' => array( @@ -1410,7 +1213,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'ingest' => array( - 'path' => 'v1alpha2/{+parent}/messages:ingest', + 'path' => 'v1beta1/{+parent}/messages:ingest', 'httpMethod' => 'POST', 'parameters' => array( 'parent' => array( @@ -1420,7 +1223,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'list' => array( - 'path' => 'v1alpha2/{+parent}/messages', + 'path' => 'v1beta1/{+parent}/messages', 'httpMethod' => 'GET', 'parameters' => array( 'parent' => array( @@ -1428,6 +1231,10 @@ class Google_Service_CloudHealthcare extends Google_Service 'type' => 'string', 'required' => true, ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -1440,13 +1247,9 @@ class Google_Service_CloudHealthcare extends Google_Service 'location' => 'query', 'type' => 'integer', ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), ), ),'patch' => array( - 'path' => 'v1alpha2/{+name}', + 'path' => 'v1beta1/{+name}', 'httpMethod' => 'PATCH', 'parameters' => array( 'name' => array( @@ -1470,7 +1273,7 @@ class Google_Service_CloudHealthcare extends Google_Service array( 'methods' => array( 'get' => array( - 'path' => 'v1alpha2/{+name}', + 'path' => 'v1beta1/{+name}', 'httpMethod' => 'GET', 'parameters' => array( 'name' => array( @@ -1480,7 +1283,7 @@ class Google_Service_CloudHealthcare extends Google_Service ), ), ),'list' => array( - 'path' => 'v1alpha2/{+name}/operations', + 'path' => 'v1beta1/{+name}/operations', 'httpMethod' => 'GET', 'parameters' => array( 'name' => array( @@ -1488,6 +1291,10 @@ class Google_Service_CloudHealthcare extends Google_Service 'type' => 'string', 'required' => true, ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -1496,10 +1303,6 @@ class Google_Service_CloudHealthcare extends Google_Service 'location' => 'query', 'type' => 'integer', ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), ), ), ) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Annotation.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Annotation.php deleted file mode 100644 index c779fb8..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Annotation.php +++ /dev/null @@ -1,94 +0,0 @@ -annotationSource = $annotationSource; - } - /** - * @return Google_Service_CloudHealthcare_AnnotationSource - */ - public function getAnnotationSource() - { - return $this->annotationSource; - } - /** - * @param Google_Service_CloudHealthcare_ImageAnnotation - */ - public function setImageAnnotation(Google_Service_CloudHealthcare_ImageAnnotation $imageAnnotation) - { - $this->imageAnnotation = $imageAnnotation; - } - /** - * @return Google_Service_CloudHealthcare_ImageAnnotation - */ - public function getImageAnnotation() - { - return $this->imageAnnotation; - } - public function setName($name) - { - $this->name = $name; - } - public function getName() - { - return $this->name; - } - /** - * @param Google_Service_CloudHealthcare_ResourceAnnotation - */ - public function setResourceAnnotation(Google_Service_CloudHealthcare_ResourceAnnotation $resourceAnnotation) - { - $this->resourceAnnotation = $resourceAnnotation; - } - /** - * @return Google_Service_CloudHealthcare_ResourceAnnotation - */ - public function getResourceAnnotation() - { - return $this->resourceAnnotation; - } - /** - * @param Google_Service_CloudHealthcare_SensitiveTextAnnotation - */ - public function setTextAnnotation(Google_Service_CloudHealthcare_SensitiveTextAnnotation $textAnnotation) - { - $this->textAnnotation = $textAnnotation; - } - /** - * @return Google_Service_CloudHealthcare_SensitiveTextAnnotation - */ - public function getTextAnnotation() - { - return $this->textAnnotation; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/AuditLogConfig.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/AuditLogConfig.php index 6f57d5c..4c8b3c0 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/AuditLogConfig.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/AuditLogConfig.php @@ -19,7 +19,6 @@ class Google_Service_CloudHealthcare_AuditLogConfig extends Google_Collection { protected $collection_key = 'exemptedMembers'; public $exemptedMembers; - public $ignoreChildExemptions; public $logType; public function setExemptedMembers($exemptedMembers) @@ -30,14 +29,6 @@ class Google_Service_CloudHealthcare_AuditLogConfig extends Google_Collection { return $this->exemptedMembers; } - public function setIgnoreChildExemptions($ignoreChildExemptions) - { - $this->ignoreChildExemptions = $ignoreChildExemptions; - } - public function getIgnoreChildExemptions() - { - return $this->ignoreChildExemptions; - } public function setLogType($logType) { $this->logType = $logType; diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/DeidentifySummary.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/DeidentifySummary.php index 9d78f77..9292f82 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/DeidentifySummary.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/DeidentifySummary.php @@ -17,9 +17,18 @@ class Google_Service_CloudHealthcare_DeidentifySummary extends Google_Model { + public $failureResourceCount; public $successResourceCount; public $successStoreCount; + public function setFailureResourceCount($failureResourceCount) + { + $this->failureResourceCount = $failureResourceCount; + } + public function getFailureResourceCount() + { + return $this->failureResourceCount; + } public function setSuccessResourceCount($successResourceCount) { $this->successResourceCount = $successResourceCount; diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/DicomConfig.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/DicomConfig.php index a917963..8b55986 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/DicomConfig.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/DicomConfig.php @@ -22,6 +22,7 @@ class Google_Service_CloudHealthcare_DicomConfig extends Google_Model protected $keepListDataType = ''; protected $removeListType = 'Google_Service_CloudHealthcare_TagFilterList'; protected $removeListDataType = ''; + public $skipIdRedaction; public function setFilterProfile($filterProfile) { @@ -59,4 +60,12 @@ class Google_Service_CloudHealthcare_DicomConfig extends Google_Model { return $this->removeList; } + public function setSkipIdRedaction($skipIdRedaction) + { + $this->skipIdRedaction = $skipIdRedaction; + } + public function getSkipIdRedaction() + { + return $this->skipIdRedaction; + } } diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/ExportDicomDataRequest.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/ExportDicomDataRequest.php index dd293eb..515fdbb 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/ExportDicomDataRequest.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/ExportDicomDataRequest.php @@ -17,34 +17,34 @@ class Google_Service_CloudHealthcare_ExportDicomDataRequest extends Google_Model { - protected $bigqueryDestinationType = 'Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2DicomBigQueryDestination'; + protected $bigqueryDestinationType = 'Google_Service_CloudHealthcare_GoogleCloudHealthcareV1beta1DicomBigQueryDestination'; protected $bigqueryDestinationDataType = ''; - protected $gcsDestinationType = 'Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2DicomGcsDestination'; + protected $gcsDestinationType = 'Google_Service_CloudHealthcare_GoogleCloudHealthcareV1beta1DicomGcsDestination'; protected $gcsDestinationDataType = ''; /** - * @param Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2DicomBigQueryDestination + * @param Google_Service_CloudHealthcare_GoogleCloudHealthcareV1beta1DicomBigQueryDestination */ - public function setBigqueryDestination(Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2DicomBigQueryDestination $bigqueryDestination) + public function setBigqueryDestination(Google_Service_CloudHealthcare_GoogleCloudHealthcareV1beta1DicomBigQueryDestination $bigqueryDestination) { $this->bigqueryDestination = $bigqueryDestination; } /** - * @return Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2DicomBigQueryDestination + * @return Google_Service_CloudHealthcare_GoogleCloudHealthcareV1beta1DicomBigQueryDestination */ public function getBigqueryDestination() { return $this->bigqueryDestination; } /** - * @param Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2DicomGcsDestination + * @param Google_Service_CloudHealthcare_GoogleCloudHealthcareV1beta1DicomGcsDestination */ - public function setGcsDestination(Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2DicomGcsDestination $gcsDestination) + public function setGcsDestination(Google_Service_CloudHealthcare_GoogleCloudHealthcareV1beta1DicomGcsDestination $gcsDestination) { $this->gcsDestination = $gcsDestination; } /** - * @return Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2DicomGcsDestination + * @return Google_Service_CloudHealthcare_GoogleCloudHealthcareV1beta1DicomGcsDestination */ public function getGcsDestination() { diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/ExportResourcesRequest.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/ExportResourcesRequest.php index 2fed194..07b56f8 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/ExportResourcesRequest.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/ExportResourcesRequest.php @@ -17,34 +17,34 @@ class Google_Service_CloudHealthcare_ExportResourcesRequest extends Google_Model { - protected $bigqueryDestinationType = 'Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2FhirBigQueryDestination'; + protected $bigqueryDestinationType = 'Google_Service_CloudHealthcare_GoogleCloudHealthcareV1beta1FhirBigQueryDestination'; protected $bigqueryDestinationDataType = ''; - protected $gcsDestinationType = 'Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2FhirRestGcsDestination'; + protected $gcsDestinationType = 'Google_Service_CloudHealthcare_GoogleCloudHealthcareV1beta1FhirRestGcsDestination'; protected $gcsDestinationDataType = ''; /** - * @param Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2FhirBigQueryDestination + * @param Google_Service_CloudHealthcare_GoogleCloudHealthcareV1beta1FhirBigQueryDestination */ - public function setBigqueryDestination(Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2FhirBigQueryDestination $bigqueryDestination) + public function setBigqueryDestination(Google_Service_CloudHealthcare_GoogleCloudHealthcareV1beta1FhirBigQueryDestination $bigqueryDestination) { $this->bigqueryDestination = $bigqueryDestination; } /** - * @return Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2FhirBigQueryDestination + * @return Google_Service_CloudHealthcare_GoogleCloudHealthcareV1beta1FhirBigQueryDestination */ public function getBigqueryDestination() { return $this->bigqueryDestination; } /** - * @param Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2FhirRestGcsDestination + * @param Google_Service_CloudHealthcare_GoogleCloudHealthcareV1beta1FhirRestGcsDestination */ - public function setGcsDestination(Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2FhirRestGcsDestination $gcsDestination) + public function setGcsDestination(Google_Service_CloudHealthcare_GoogleCloudHealthcareV1beta1FhirRestGcsDestination $gcsDestination) { $this->gcsDestination = $gcsDestination; } /** - * @return Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2FhirRestGcsDestination + * @return Google_Service_CloudHealthcare_GoogleCloudHealthcareV1beta1FhirRestGcsDestination */ public function getGcsDestination() { diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/FhirStore.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/FhirStore.php index bf5a291..833c7dd 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/FhirStore.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/FhirStore.php @@ -15,23 +15,15 @@ * the License. */ -class Google_Service_CloudHealthcare_FhirStore extends Google_Collection +class Google_Service_CloudHealthcare_FhirStore extends Google_Model { - protected $collection_key = 'streamConfigs'; public $disableReferentialIntegrity; public $disableResourceVersioning; - public $enableHistoryImport; public $enableUpdateCreate; public $labels; public $name; protected $notificationConfigType = 'Google_Service_CloudHealthcare_NotificationConfig'; protected $notificationConfigDataType = ''; - protected $streamConfigsType = 'Google_Service_CloudHealthcare_StreamConfig'; - protected $streamConfigsDataType = 'array'; - protected $subscriptionConfigType = 'Google_Service_CloudHealthcare_SubscriptionConfig'; - protected $subscriptionConfigDataType = ''; - protected $validationConfigType = 'Google_Service_CloudHealthcare_ValidationConfig'; - protected $validationConfigDataType = ''; public function setDisableReferentialIntegrity($disableReferentialIntegrity) { @@ -49,14 +41,6 @@ class Google_Service_CloudHealthcare_FhirStore extends Google_Collection { return $this->disableResourceVersioning; } - public function setEnableHistoryImport($enableHistoryImport) - { - $this->enableHistoryImport = $enableHistoryImport; - } - public function getEnableHistoryImport() - { - return $this->enableHistoryImport; - } public function setEnableUpdateCreate($enableUpdateCreate) { $this->enableUpdateCreate = $enableUpdateCreate; @@ -95,46 +79,4 @@ class Google_Service_CloudHealthcare_FhirStore extends Google_Collection { return $this->notificationConfig; } - /** - * @param Google_Service_CloudHealthcare_StreamConfig - */ - public function setStreamConfigs($streamConfigs) - { - $this->streamConfigs = $streamConfigs; - } - /** - * @return Google_Service_CloudHealthcare_StreamConfig - */ - public function getStreamConfigs() - { - return $this->streamConfigs; - } - /** - * @param Google_Service_CloudHealthcare_SubscriptionConfig - */ - public function setSubscriptionConfig(Google_Service_CloudHealthcare_SubscriptionConfig $subscriptionConfig) - { - $this->subscriptionConfig = $subscriptionConfig; - } - /** - * @return Google_Service_CloudHealthcare_SubscriptionConfig - */ - public function getSubscriptionConfig() - { - return $this->subscriptionConfig; - } - /** - * @param Google_Service_CloudHealthcare_ValidationConfig - */ - public function setValidationConfig(Google_Service_CloudHealthcare_ValidationConfig $validationConfig) - { - $this->validationConfig = $validationConfig; - } - /** - * @return Google_Service_CloudHealthcare_ValidationConfig - */ - public function getValidationConfig() - { - return $this->validationConfig; - } } diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1alpha2DicomBigQueryDestination.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1beta1DicomBigQueryDestination.php similarity index 89% rename from vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1alpha2DicomBigQueryDestination.php rename to vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1beta1DicomBigQueryDestination.php index e39277c..2bcf937 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1alpha2DicomBigQueryDestination.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1beta1DicomBigQueryDestination.php @@ -15,7 +15,7 @@ * the License. */ -class Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2DicomBigQueryDestination extends Google_Model +class Google_Service_CloudHealthcare_GoogleCloudHealthcareV1beta1DicomBigQueryDestination extends Google_Model { public $force; public $tableUri; diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1alpha2DicomGcsDestination.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1beta1DicomGcsDestination.php similarity index 89% rename from vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1alpha2DicomGcsDestination.php rename to vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1beta1DicomGcsDestination.php index 20fbb88..3b8ad8b 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1alpha2DicomGcsDestination.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1beta1DicomGcsDestination.php @@ -15,7 +15,7 @@ * the License. */ -class Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2DicomGcsDestination extends Google_Model +class Google_Service_CloudHealthcare_GoogleCloudHealthcareV1beta1DicomGcsDestination extends Google_Model { public $mimeType; public $uriPrefix; diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1GcsDestination.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1beta1DicomGcsSource.php similarity index 87% rename from vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1GcsDestination.php rename to vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1beta1DicomGcsSource.php index 9f22083..38dd6f0 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1GcsDestination.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1beta1DicomGcsSource.php @@ -15,7 +15,7 @@ * the License. */ -class Google_Service_Vision_GoogleCloudVisionV1p5beta1GcsDestination extends Google_Model +class Google_Service_CloudHealthcare_GoogleCloudHealthcareV1beta1DicomGcsSource extends Google_Model { public $uri; diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1alpha2FhirBigQueryDestination.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1beta1FhirBigQueryDestination.php similarity index 82% rename from vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1alpha2FhirBigQueryDestination.php rename to vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1beta1FhirBigQueryDestination.php index 028b47f..a59a8e1 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1alpha2FhirBigQueryDestination.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1beta1FhirBigQueryDestination.php @@ -15,9 +15,10 @@ * the License. */ -class Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2FhirBigQueryDestination extends Google_Model +class Google_Service_CloudHealthcare_GoogleCloudHealthcareV1beta1FhirBigQueryDestination extends Google_Model { public $datasetUri; + public $force; protected $schemaConfigType = 'Google_Service_CloudHealthcare_SchemaConfig'; protected $schemaConfigDataType = ''; @@ -29,6 +30,14 @@ class Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2FhirBigQueryDe { return $this->datasetUri; } + public function setForce($force) + { + $this->force = $force; + } + public function getForce() + { + return $this->force; + } /** * @param Google_Service_CloudHealthcare_SchemaConfig */ diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1beta1FhirRestExportResourcesErrorDetails.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1beta1FhirRestExportResourcesErrorDetails.php new file mode 100644 index 0000000..7ae56f3 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1beta1FhirRestExportResourcesErrorDetails.php @@ -0,0 +1,57 @@ +errorCount = $errorCount; + } + public function getErrorCount() + { + return $this->errorCount; + } + public function setFhirStore($fhirStore) + { + $this->fhirStore = $fhirStore; + } + public function getFhirStore() + { + return $this->fhirStore; + } + public function setResourceCount($resourceCount) + { + $this->resourceCount = $resourceCount; + } + public function getResourceCount() + { + return $this->resourceCount; + } + public function setSuccessCount($successCount) + { + $this->successCount = $successCount; + } + public function getSuccessCount() + { + return $this->successCount; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1alpha2FhirRestExportResourcesResponse.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1beta1FhirRestExportResourcesResponse.php similarity index 89% rename from vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1alpha2FhirRestExportResourcesResponse.php rename to vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1beta1FhirRestExportResourcesResponse.php index e2b55ce..0ac7fcb 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1alpha2FhirRestExportResourcesResponse.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1beta1FhirRestExportResourcesResponse.php @@ -15,7 +15,7 @@ * the License. */ -class Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2FhirRestExportResourcesResponse extends Google_Model +class Google_Service_CloudHealthcare_GoogleCloudHealthcareV1beta1FhirRestExportResourcesResponse extends Google_Model { public $fhirStore; public $resourceCount; diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1alpha2FhirRestGcsDestination.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1beta1FhirRestGcsDestination.php similarity index 87% rename from vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1alpha2FhirRestGcsDestination.php rename to vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1beta1FhirRestGcsDestination.php index 1207a14..8e28080 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1alpha2FhirRestGcsDestination.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1beta1FhirRestGcsDestination.php @@ -15,7 +15,7 @@ * the License. */ -class Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2FhirRestGcsDestination extends Google_Model +class Google_Service_CloudHealthcare_GoogleCloudHealthcareV1beta1FhirRestGcsDestination extends Google_Model { public $uriPrefix; diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1alpha2DicomGcsSource.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1beta1FhirRestGcsSource.php similarity index 87% rename from vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1alpha2DicomGcsSource.php rename to vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1beta1FhirRestGcsSource.php index 0b7d2c3..53242e6 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1alpha2DicomGcsSource.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1beta1FhirRestGcsSource.php @@ -15,7 +15,7 @@ * the License. */ -class Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2DicomGcsSource extends Google_Model +class Google_Service_CloudHealthcare_GoogleCloudHealthcareV1beta1FhirRestGcsSource extends Google_Model { public $uri; diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1alpha2FhirRestImportResourcesErrorDetails.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1beta1FhirRestImportResourcesErrorDetails.php similarity index 91% rename from vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1alpha2FhirRestImportResourcesErrorDetails.php rename to vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1beta1FhirRestImportResourcesErrorDetails.php index 6225368..cefe207 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1alpha2FhirRestImportResourcesErrorDetails.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1beta1FhirRestImportResourcesErrorDetails.php @@ -15,7 +15,7 @@ * the License. */ -class Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2FhirRestImportResourcesErrorDetails extends Google_Model +class Google_Service_CloudHealthcare_GoogleCloudHealthcareV1beta1FhirRestImportResourcesErrorDetails extends Google_Model { public $errorCount; public $fhirStore; diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1alpha2FhirRestImportResourcesResponse.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1beta1FhirRestImportResourcesResponse.php similarity index 88% rename from vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1alpha2FhirRestImportResourcesResponse.php rename to vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1beta1FhirRestImportResourcesResponse.php index 0d89905..4cae561 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1alpha2FhirRestImportResourcesResponse.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1beta1FhirRestImportResourcesResponse.php @@ -15,7 +15,7 @@ * the License. */ -class Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2FhirRestImportResourcesResponse extends Google_Model +class Google_Service_CloudHealthcare_GoogleCloudHealthcareV1beta1FhirRestImportResourcesResponse extends Google_Model { public $fhirStore; public $inputSize; diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/ImportDicomDataRequest.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/ImportDicomDataRequest.php index ca57a72..87c3d64 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/ImportDicomDataRequest.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/ImportDicomDataRequest.php @@ -17,18 +17,18 @@ class Google_Service_CloudHealthcare_ImportDicomDataRequest extends Google_Model { - protected $gcsSourceType = 'Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2DicomGcsSource'; + protected $gcsSourceType = 'Google_Service_CloudHealthcare_GoogleCloudHealthcareV1beta1DicomGcsSource'; protected $gcsSourceDataType = ''; /** - * @param Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2DicomGcsSource + * @param Google_Service_CloudHealthcare_GoogleCloudHealthcareV1beta1DicomGcsSource */ - public function setGcsSource(Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2DicomGcsSource $gcsSource) + public function setGcsSource(Google_Service_CloudHealthcare_GoogleCloudHealthcareV1beta1DicomGcsSource $gcsSource) { $this->gcsSource = $gcsSource; } /** - * @return Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2DicomGcsSource + * @return Google_Service_CloudHealthcare_GoogleCloudHealthcareV1beta1DicomGcsSource */ public function getGcsSource() { diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/ImportResourcesRequest.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/ImportResourcesRequest.php index b82980c..15c2a15 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/ImportResourcesRequest.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/ImportResourcesRequest.php @@ -18,9 +18,7 @@ class Google_Service_CloudHealthcare_ImportResourcesRequest extends Google_Model { public $contentStructure; - protected $gcsErrorDestinationType = 'Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2FhirRestGcsErrorDestination'; - protected $gcsErrorDestinationDataType = ''; - protected $gcsSourceType = 'Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2FhirRestGcsSource'; + protected $gcsSourceType = 'Google_Service_CloudHealthcare_GoogleCloudHealthcareV1beta1FhirRestGcsSource'; protected $gcsSourceDataType = ''; public function setContentStructure($contentStructure) @@ -32,28 +30,14 @@ class Google_Service_CloudHealthcare_ImportResourcesRequest extends Google_Model return $this->contentStructure; } /** - * @param Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2FhirRestGcsErrorDestination + * @param Google_Service_CloudHealthcare_GoogleCloudHealthcareV1beta1FhirRestGcsSource */ - public function setGcsErrorDestination(Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2FhirRestGcsErrorDestination $gcsErrorDestination) - { - $this->gcsErrorDestination = $gcsErrorDestination; - } - /** - * @return Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2FhirRestGcsErrorDestination - */ - public function getGcsErrorDestination() - { - return $this->gcsErrorDestination; - } - /** - * @param Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2FhirRestGcsSource - */ - public function setGcsSource(Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2FhirRestGcsSource $gcsSource) + public function setGcsSource(Google_Service_CloudHealthcare_GoogleCloudHealthcareV1beta1FhirRestGcsSource $gcsSource) { $this->gcsSource = $gcsSource; } /** - * @return Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2FhirRestGcsSource + * @return Google_Service_CloudHealthcare_GoogleCloudHealthcareV1beta1FhirRestGcsSource */ public function getGcsSource() { diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasets.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasets.php index 7e0acc5..33dcb68 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasets.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasets.php @@ -32,8 +32,8 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasets extends * Google Cloud Platform project can contain up to 500 datasets across all * regions. (datasets.create) * - * @param string $parent The name of the project in which the dataset should be - * created (e.g., `projects/{project_id}/locations/{location_id}`). + * @param string $parent The name of the project where the server creates the + * dataset. For example, `projects/{project_id}/locations/{location_id}`. * @param Google_Service_CloudHealthcare_Dataset $postBody * @param array $optParams Optional parameters. * @@ -51,10 +51,12 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasets extends * Creates a new dataset containing de-identified data from the source dataset. * The metadata field type is OperationMetadata. If the request is successful, * the response field type is DeidentifySummary. If errors occur, details field - * type is DeidentifyErrorDetails. (datasets.deidentify) + * type is DeidentifyErrorDetails. Errors are also logged to Stackdriver + * Logging. For more information, see [Viewing logs](/healthcare/docs/how-tos + * /stackdriver-logging). (datasets.deidentify) * - * @param string $sourceDataset Source dataset resource name. (e.g., - * `projects/{project_id}/locations/{location_id}/datasets/{dataset_id}`). + * @param string $sourceDataset Source dataset resource name. For example, + * `projects/{project_id}/locations/{location_id}/datasets/{dataset_id}`. * @param Google_Service_CloudHealthcare_DeidentifyDatasetRequest $postBody * @param array $optParams Optional parameters. * @return Google_Service_CloudHealthcare_Operation @@ -70,8 +72,8 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasets extends * Deleting a dataset does not affect the sources from which the dataset was * imported (if any). (datasets.delete) * - * @param string $name The name of the dataset to delete (e.g., - * `projects/{project_id}/locations/{location_id}/datasets/{dataset_id}`). + * @param string $name The name of the dataset to delete. For example, + * `projects/{project_id}/locations/{location_id}/datasets/{dataset_id}`. * @param array $optParams Optional parameters. * @return Google_Service_CloudHealthcare_HealthcareEmpty */ @@ -84,8 +86,8 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasets extends /** * Gets any metadata associated with a dataset. (datasets.get) * - * @param string $name The name of the dataset to read (e.g., - * `projects/{project_id}/locations/{location_id}/datasets/{dataset_id}`). + * @param string $name The name of the dataset to read. For example, + * `projects/{project_id}/locations/{location_id}/datasets/{dataset_id}`. * @param array $optParams Optional parameters. * @return Google_Service_CloudHealthcare_Dataset */ @@ -105,8 +107,14 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasets extends * @param array $optParams Optional parameters. * * @opt_param int options.requestedPolicyVersion Optional. The policy format - * version to be returned. Acceptable values are 0 and 1. If the value is 0, or - * the field is omitted, policy format version 1 will be returned. + * version to be returned. + * + * Valid values are 0, 1, and 3. Requests specifying an invalid value will be + * rejected. + * + * Requests for policies with any conditional bindings must specify version 3. + * Policies without any conditional bindings may specify any valid value or + * leave the field unset. * @return Google_Service_CloudHealthcare_Policy */ public function getIamPolicy($resource, $optParams = array()) @@ -119,8 +127,8 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasets extends * Lists the health datasets in the current project. * (datasets.listProjectsLocationsDatasets) * - * @param string $parent The name of the project whose datasets should be listed - * (e.g., `projects/{project_id}/locations/{location_id}`). + * @param string $parent The name of the project whose datasets should be + * listed. For example, `projects/{project_id}/locations/{location_id}`. * @param array $optParams Optional parameters. * * @opt_param string pageToken The next_page_token value returned from a diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsAnnotationStores.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsAnnotationStores.php deleted file mode 100644 index 88c9041..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsAnnotationStores.php +++ /dev/null @@ -1,183 +0,0 @@ - - * $healthcareService = new Google_Service_CloudHealthcare(...); - * $annotationStores = $healthcareService->annotationStores; - * - */ -class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsAnnotationStores extends Google_Service_Resource -{ - /** - * Creates a new Annotation store within the parent dataset. - * (annotationStores.create) - * - * @param string $parent The name of the dataset this Annotation store belongs - * to. - * @param Google_Service_CloudHealthcare_AnnotationStore $postBody - * @param array $optParams Optional parameters. - * - * @opt_param string annotationStoreId The ID of the Annotation store that is - * being created. The string must match the following regex: - * `[\p{L}\p{N}_\-\.]{1,256}`. - * @return Google_Service_CloudHealthcare_AnnotationStore - */ - public function create($parent, Google_Service_CloudHealthcare_AnnotationStore $postBody, $optParams = array()) - { - $params = array('parent' => $parent, 'postBody' => $postBody); - $params = array_merge($params, $optParams); - return $this->call('create', array($params), "Google_Service_CloudHealthcare_AnnotationStore"); - } - /** - * Deletes the specified Annotation store and removes all annotations that are - * contained within it. (annotationStores.delete) - * - * @param string $name The resource name of the Annotation store to delete. - * @param array $optParams Optional parameters. - * @return Google_Service_CloudHealthcare_HealthcareEmpty - */ - public function delete($name, $optParams = array()) - { - $params = array('name' => $name); - $params = array_merge($params, $optParams); - return $this->call('delete', array($params), "Google_Service_CloudHealthcare_HealthcareEmpty"); - } - /** - * Gets the specified Annotation store or returns NOT_FOUND if it does not - * exist. (annotationStores.get) - * - * @param string $name The resource name of the Annotation store to get. - * @param array $optParams Optional parameters. - * @return Google_Service_CloudHealthcare_AnnotationStore - */ - public function get($name, $optParams = array()) - { - $params = array('name' => $name); - $params = array_merge($params, $optParams); - return $this->call('get', array($params), "Google_Service_CloudHealthcare_AnnotationStore"); - } - /** - * Gets the access control policy for a resource. Returns NOT_FOUND error if the - * resource does not exist. Returns an empty policy if the resource exists but - * does not have a policy set. - * - * Authorization requires the Google IAM permission - * `healthcare.AnnotationStores.getIamPolicy` on the specified resource - * (annotationStores.getIamPolicy) - * - * @param string $resource REQUIRED: The resource for which the policy is being - * requested. See the operation documentation for the appropriate value for this - * field. - * @param Google_Service_CloudHealthcare_GetIamPolicyRequest $postBody - * @param array $optParams Optional parameters. - * @return Google_Service_CloudHealthcare_Policy - */ - public function getIamPolicy($resource, Google_Service_CloudHealthcare_GetIamPolicyRequest $postBody, $optParams = array()) - { - $params = array('resource' => $resource, 'postBody' => $postBody); - $params = array_merge($params, $optParams); - return $this->call('getIamPolicy', array($params), "Google_Service_CloudHealthcare_Policy"); - } - /** - * Lists the Annotation stores in the given dataset for a source store. - * (annotationStores.listProjectsLocationsDatasetsAnnotationStores) - * - * @param string $parent Name of the dataset. - * @param array $optParams Optional parameters. - * - * @opt_param string filter Restricts stores returned to those matching a - * filter. Syntax: - * https://cloud.google.com/appengine/docs/standard/python/search/query_strings - * Only filtering on labels is supported, for example `labels.key=value`. - * @opt_param string pageToken The next_page_token value returned from the - * previous List request, if any. - * @opt_param int pageSize Limit on the number of Annotation stores to return in - * a single response. If zero the default page size of 100 is used. - * @return Google_Service_CloudHealthcare_ListAnnotationStoresResponse - */ - public function listProjectsLocationsDatasetsAnnotationStores($parent, $optParams = array()) - { - $params = array('parent' => $parent); - $params = array_merge($params, $optParams); - return $this->call('list', array($params), "Google_Service_CloudHealthcare_ListAnnotationStoresResponse"); - } - /** - * Updates the specified Annotation store. (annotationStores.patch) - * - * @param string $name Output only. Resource name of the Annotation store, of - * the form `projects/{project_id}/locations/{location_id}/datasets/{dataset_id} - * /annotationStores/{annotation_store_id}`. - * @param Google_Service_CloudHealthcare_AnnotationStore $postBody - * @param array $optParams Optional parameters. - * - * @opt_param string updateMask The update mask applies to the resource. For the - * `FieldMask` definition, see https://developers.google.com/protocol- - * buffers/docs/reference/google.protobuf#fieldmask - * @return Google_Service_CloudHealthcare_AnnotationStore - */ - public function patch($name, Google_Service_CloudHealthcare_AnnotationStore $postBody, $optParams = array()) - { - $params = array('name' => $name, 'postBody' => $postBody); - $params = array_merge($params, $optParams); - return $this->call('patch', array($params), "Google_Service_CloudHealthcare_AnnotationStore"); - } - /** - * POLICIES Sets the access control policy for a resource. Replaces any existing - * policy. - * - * Authorization requires the Google IAM permission - * `healthcare.annotationStores.setIamPolicy` on the specified resource - * (annotationStores.setIamPolicy) - * - * @param string $resource REQUIRED: The resource for which the policy is being - * specified. See the operation documentation for the appropriate value for this - * field. - * @param Google_Service_CloudHealthcare_SetIamPolicyRequest $postBody - * @param array $optParams Optional parameters. - * @return Google_Service_CloudHealthcare_Policy - */ - public function setIamPolicy($resource, Google_Service_CloudHealthcare_SetIamPolicyRequest $postBody, $optParams = array()) - { - $params = array('resource' => $resource, 'postBody' => $postBody); - $params = array_merge($params, $optParams); - return $this->call('setIamPolicy', array($params), "Google_Service_CloudHealthcare_Policy"); - } - /** - * Returns permissions that a caller has on the specified resource. If the - * resource does not exist, this will return an empty set of permissions, not a - * NOT_FOUND error. - * - * There is no permission required to make this API call. - * (annotationStores.testIamPermissions) - * - * @param string $resource REQUIRED: The resource for which the policy detail is - * being requested. See the operation documentation for the appropriate value - * for this field. - * @param Google_Service_CloudHealthcare_TestIamPermissionsRequest $postBody - * @param array $optParams Optional parameters. - * @return Google_Service_CloudHealthcare_TestIamPermissionsResponse - */ - public function testIamPermissions($resource, Google_Service_CloudHealthcare_TestIamPermissionsRequest $postBody, $optParams = array()) - { - $params = array('resource' => $resource, 'postBody' => $postBody); - $params = array_merge($params, $optParams); - return $this->call('testIamPermissions', array($params), "Google_Service_CloudHealthcare_TestIamPermissionsResponse"); - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsAnnotationStoresAnnotations.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsAnnotationStoresAnnotations.php deleted file mode 100644 index 35f5765..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsAnnotationStoresAnnotations.php +++ /dev/null @@ -1,117 +0,0 @@ - - * $healthcareService = new Google_Service_CloudHealthcare(...); - * $annotations = $healthcareService->annotations; - * - */ -class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsAnnotationStoresAnnotations extends Google_Service_Resource -{ - /** - * Creates a new Annotation record. It is valid to create Annotation objects for - * the same source more than once since a unique ID is assigned to each record - * by this service. (annotations.create) - * - * @param string $parent The name of the Annotation store this annotation - * belongs to. For example, `projects/my-project/locations/us- - * central1/datasets/mydataset/annotationStores/myannotationstore`. - * @param Google_Service_CloudHealthcare_Annotation $postBody - * @param array $optParams Optional parameters. - * @return Google_Service_CloudHealthcare_Annotation - */ - public function create($parent, Google_Service_CloudHealthcare_Annotation $postBody, $optParams = array()) - { - $params = array('parent' => $parent, 'postBody' => $postBody); - $params = array_merge($params, $optParams); - return $this->call('create', array($params), "Google_Service_CloudHealthcare_Annotation"); - } - /** - * Deletes an Annotation or returns NOT_FOUND if it does not exist. - * (annotations.delete) - * - * @param string $name The resource name of the Annotation to delete. - * @param array $optParams Optional parameters. - * @return Google_Service_CloudHealthcare_HealthcareEmpty - */ - public function delete($name, $optParams = array()) - { - $params = array('name' => $name); - $params = array_merge($params, $optParams); - return $this->call('delete', array($params), "Google_Service_CloudHealthcare_HealthcareEmpty"); - } - /** - * Gets an Annotation. (annotations.get) - * - * @param string $name The resource name of the Annotation to retrieve. - * @param array $optParams Optional parameters. - * @return Google_Service_CloudHealthcare_Annotation - */ - public function get($name, $optParams = array()) - { - $params = array('name' => $name); - $params = array_merge($params, $optParams); - return $this->call('get', array($params), "Google_Service_CloudHealthcare_Annotation"); - } - /** - * Lists the Annotations in the given Annotation store for a source resource. - * (annotations.listProjectsLocationsDatasetsAnnotationStoresAnnotations) - * - * @param string $parent Name of the Annotation store to retrieve Annotations - * from. - * @param array $optParams Optional parameters. - * - * @opt_param string pageToken The next_page_token value returned from the - * previous List request, if any. - * @opt_param int pageSize Limit on the number of Annotations to return in a - * single response. If zero the default page size of 100 is used. - * @opt_param string filter Restricts Annotations returned to those matching a - * filter. Syntax: - * https://cloud.google.com/appengine/docs/standard/python/search/query_strings - * Fields/functions available for filtering are: - source_version - * @return Google_Service_CloudHealthcare_ListAnnotationsResponse - */ - public function listProjectsLocationsDatasetsAnnotationStoresAnnotations($parent, $optParams = array()) - { - $params = array('parent' => $parent); - $params = array_merge($params, $optParams); - return $this->call('list', array($params), "Google_Service_CloudHealthcare_ListAnnotationsResponse"); - } - /** - * Updates the Annotation. (annotations.patch) - * - * @param string $name Output only. Resource name of the Annotation, of the form - * `projects/{project_id}/locations/{location_id}/datasets/{dataset_id}/annotati - * onStores/{annotation_store_id}/annotations/{annotation_id}`. - * @param Google_Service_CloudHealthcare_Annotation $postBody - * @param array $optParams Optional parameters. - * - * @opt_param string updateMask The update mask applies to the resource. For the - * `FieldMask` definition, see https://developers.google.com/protocol- - * buffers/docs/reference/google.protobuf#fieldmask - * @return Google_Service_CloudHealthcare_Annotation - */ - public function patch($name, Google_Service_CloudHealthcare_Annotation $postBody, $optParams = array()) - { - $params = array('name' => $name, 'postBody' => $postBody); - $params = array_merge($params, $optParams); - return $this->call('patch', array($params), "Google_Service_CloudHealthcare_Annotation"); - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsDicomStores.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsDicomStores.php index 2ffc18b..5f03935 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsDicomStores.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsDicomStores.php @@ -60,9 +60,9 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsDicomStor * Exports data to the specified destination by copying it from the DICOM store. * The metadata field type is OperationMetadata. (dicomStores.export) * - * @param string $name The DICOM store resource name from which the data should - * be exported (e.g., `projects/{project_id}/locations/{location_id}/datasets/{d - * ataset_id}/dicomStores/{dicom_store_id}`). + * @param string $name The DICOM store resource name from which to export the + * data. For example, `projects/{project_id}/locations/{location_id}/datasets/{d + * ataset_id}/dicomStores/{dicom_store_id}`. * @param Google_Service_CloudHealthcare_ExportDicomDataRequest $postBody * @param array $optParams Optional parameters. * @return Google_Service_CloudHealthcare_Operation @@ -96,8 +96,14 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsDicomStor * @param array $optParams Optional parameters. * * @opt_param int options.requestedPolicyVersion Optional. The policy format - * version to be returned. Acceptable values are 0 and 1. If the value is 0, or - * the field is omitted, policy format version 1 will be returned. + * version to be returned. + * + * Valid values are 0, 1, and 3. Requests specifying an invalid value will be + * rejected. + * + * Requests for policies with any conditional bindings must specify version 3. + * Policies without any conditional bindings may specify any valid value or + * leave the field unset. * @return Google_Service_CloudHealthcare_Policy */ public function getIamPolicy($resource, $optParams = array()) @@ -108,15 +114,15 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsDicomStor } /** * Imports data into the DICOM store by copying it from the specified source. - * For errors, the Operation will be populated with error details (in the form - * of ImportDicomDataErrorDetails in error.details), which will hold finer- - * grained error information. Errors are also logged to Stackdriver (see - * [Viewing logs](/healthcare/docs/how-tos/stackdriver-logging)). The metadata - * field type is OperationMetadata. (dicomStores.import) + * For errors, the Operation is populated with error details (in the form of + * ImportDicomDataErrorDetails in error.details), which hold finer-grained error + * information. Errors are also logged to Stackdriver Logging. For more + * information, see [Viewing logs](/healthcare/docs/how-tos/stackdriver- + * logging). The metadata field type is OperationMetadata. (dicomStores.import) * * @param string $name The name of the DICOM store resource into which the data - * is imported (e.g., `projects/{project_id}/locations/{location_id}/datasets/{d - * ataset_id}/dicomStores/{dicom_store_id}`). + * is imported. For example, `projects/{project_id}/locations/{location_id}/data + * sets/{dataset_id}/dicomStores/{dicom_store_id}`. * @param Google_Service_CloudHealthcare_ImportDicomDataRequest $postBody * @param array $optParams Optional parameters. * @return Google_Service_CloudHealthcare_Operation @@ -137,7 +143,7 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsDicomStor * @opt_param string filter Restricts stores returned to those matching a * filter. Syntax: * https://cloud.google.com/appengine/docs/standard/python/search/query_strings - * Only filtering on labels is supported, for example `labels.key=value`. + * Only filtering on labels is supported. For example, `labels.key=value`. * @opt_param string pageToken The next_page_token value returned from the * previous List request, if any. * @opt_param int pageSize Limit on the number of DICOM stores to return in a @@ -170,6 +176,64 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsDicomStor $params = array_merge($params, $optParams); return $this->call('patch', array($params), "Google_Service_CloudHealthcare_DicomStore"); } + /** + * SearchForInstances returns a list of matching instances. See http://dicom.nem + * a.org/medical/dicom/current/output/html/part18.html#sect_10.6. + * (dicomStores.searchForInstances) + * + * @param string $parent The name of the DICOM store that is being accessed (for + * example, `projects/{project_id}/locations/{location_id}/datasets/{dataset_id} + * /dicomStores/{dicom_store_id}`). + * @param string $dicomWebPath The path of the SearchForInstancesRequest + * DICOMweb request (for example, `instances` or `series/{series_uid}/instances` + * or `studies/{study_uid}/instances`). + * @param array $optParams Optional parameters. + * @return Google_Service_CloudHealthcare_HttpBody + */ + public function searchForInstances($parent, $dicomWebPath, $optParams = array()) + { + $params = array('parent' => $parent, 'dicomWebPath' => $dicomWebPath); + $params = array_merge($params, $optParams); + return $this->call('searchForInstances', array($params), "Google_Service_CloudHealthcare_HttpBody"); + } + /** + * SearchForSeries returns a list of matching series. See http://dicom.nema.org/ + * medical/dicom/current/output/html/part18.html#sect_10.6. + * (dicomStores.searchForSeries) + * + * @param string $parent The name of the DICOM store that is being accessed (for + * example, `projects/{project_id}/locations/{location_id}/datasets/{dataset_id} + * /dicomStores/{dicom_store_id}`). + * @param string $dicomWebPath The path of the SearchForSeries DICOMweb + * request(for example, `series` or `studies/{study_uid}/series`). + * @param array $optParams Optional parameters. + * @return Google_Service_CloudHealthcare_HttpBody + */ + public function searchForSeries($parent, $dicomWebPath, $optParams = array()) + { + $params = array('parent' => $parent, 'dicomWebPath' => $dicomWebPath); + $params = array_merge($params, $optParams); + return $this->call('searchForSeries', array($params), "Google_Service_CloudHealthcare_HttpBody"); + } + /** + * SearchForStudies returns a list of matching studies. See http://dicom.nema.or + * g/medical/dicom/current/output/html/part18.html#sect_10.6. + * (dicomStores.searchForStudies) + * + * @param string $parent The name of the DICOM store that is being accessed (for + * example, `projects/{project_id}/locations/{location_id}/datasets/{dataset_id} + * /dicomStores/{dicom_store_id}`). + * @param string $dicomWebPath The path of the SearchForStudies DICOMweb request + * (for example, `studies`). + * @param array $optParams Optional parameters. + * @return Google_Service_CloudHealthcare_HttpBody + */ + public function searchForStudies($parent, $dicomWebPath, $optParams = array()) + { + $params = array('parent' => $parent, 'dicomWebPath' => $dicomWebPath); + $params = array_merge($params, $optParams); + return $this->call('searchForStudies', array($params), "Google_Service_CloudHealthcare_HttpBody"); + } /** * Sets the access control policy on the specified resource. Replaces any * existing policy. (dicomStores.setIamPolicy) @@ -187,6 +251,27 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsDicomStor $params = array_merge($params, $optParams); return $this->call('setIamPolicy', array($params), "Google_Service_CloudHealthcare_Policy"); } + /** + * StoreInstances stores DICOM instances associated with study instance unique + * identifiers (SUID). See http://dicom.nema.org/medical/dicom/current/output/ht + * ml/part18.html#sect_10.5. (dicomStores.storeInstances) + * + * @param string $parent The name of the DICOM store that is being accessed (for + * example, `projects/{project_id}/locations/{location_id}/datasets/{dataset_id} + * /dicomStores/{dicom_store_id}`). + * @param string $dicomWebPath The path of the StoreInstances DICOMweb request + * (for example, `studies/[{study_uid}]`). Note that the `study_uid` is + * optional. + * @param Google_Service_CloudHealthcare_HttpBody $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_CloudHealthcare_HttpBody + */ + public function storeInstances($parent, $dicomWebPath, Google_Service_CloudHealthcare_HttpBody $postBody, $optParams = array()) + { + $params = array('parent' => $parent, 'dicomWebPath' => $dicomWebPath, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('storeInstances', array($params), "Google_Service_CloudHealthcare_HttpBody"); + } /** * Returns permissions that a caller has on the specified resource. If the * resource does not exist, this will return an empty set of permissions, not a diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsDicomStoresDicomWeb.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsDicomStoresDicomWeb.php deleted file mode 100644 index 39a67f3..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsDicomStoresDicomWeb.php +++ /dev/null @@ -1,106 +0,0 @@ - - * $healthcareService = new Google_Service_CloudHealthcare(...); - * $dicomWeb = $healthcareService->dicomWeb; - * - */ -class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsDicomStoresDicomWeb extends Google_Service_Resource -{ - /** - * SearchForInstances returns a list of matching instances. See http://dicom.nem - * a.org/medical/dicom/current/output/html/part18.html#sect_10.6. - * (dicomWeb.searchForInstances) - * - * @param string $parent The name of the DICOM store that is being accessed - * (e.g., `projects/{project_id}/locations/{location_id}/datasets/{dataset_id}/d - * icomStores/{dicom_store_id}`). - * @param string $dicomWebPath The path of the SearchForInstancesRequest - * DICOMweb request (e.g., `instances` or `series/{series_uid}/instances` or - * `studies/{study_uid}/instances`). - * @param array $optParams Optional parameters. - * @return Google_Service_CloudHealthcare_HttpBody - */ - public function searchForInstances($parent, $dicomWebPath, $optParams = array()) - { - $params = array('parent' => $parent, 'dicomWebPath' => $dicomWebPath); - $params = array_merge($params, $optParams); - return $this->call('searchForInstances', array($params), "Google_Service_CloudHealthcare_HttpBody"); - } - /** - * SearchForSeries returns a list of matching series. See http://dicom.nema.org/ - * medical/dicom/current/output/html/part18.html#sect_10.6. - * (dicomWeb.searchForSeries) - * - * @param string $parent The name of the DICOM store that is being accessed - * (e.g., `projects/{project_id}/locations/{location_id}/datasets/{dataset_id}/d - * icomStores/{dicom_store_id}`). - * @param string $dicomWebPath The path of the SearchForSeries DICOMweb - * request(e.g., `series` or `studies/{study_uid}/series`). - * @param array $optParams Optional parameters. - * @return Google_Service_CloudHealthcare_HttpBody - */ - public function searchForSeries($parent, $dicomWebPath, $optParams = array()) - { - $params = array('parent' => $parent, 'dicomWebPath' => $dicomWebPath); - $params = array_merge($params, $optParams); - return $this->call('searchForSeries', array($params), "Google_Service_CloudHealthcare_HttpBody"); - } - /** - * SearchForStudies returns a list of matching studies. See http://dicom.nema.or - * g/medical/dicom/current/output/html/part18.html#sect_10.6. - * (dicomWeb.searchForStudies) - * - * @param string $parent The name of the DICOM store that is being accessed - * (e.g., `projects/{project_id}/locations/{location_id}/datasets/{dataset_id}/d - * icomStores/{dicom_store_id}`). - * @param string $dicomWebPath The path of the SearchForStudies DICOMweb request - * (e.g., `studies`). - * @param array $optParams Optional parameters. - * @return Google_Service_CloudHealthcare_HttpBody - */ - public function searchForStudies($parent, $dicomWebPath, $optParams = array()) - { - $params = array('parent' => $parent, 'dicomWebPath' => $dicomWebPath); - $params = array_merge($params, $optParams); - return $this->call('searchForStudies', array($params), "Google_Service_CloudHealthcare_HttpBody"); - } - /** - * StoreInstances stores DICOM instances associated with study instance unique - * identifiers (SUID). See http://dicom.nema.org/medical/dicom/current/output/ht - * ml/part18.html#sect_10.5. (dicomWeb.storeInstances) - * - * @param string $parent The name of the DICOM store that is being accessed - * (e.g., `projects/{project_id}/locations/{location_id}/datasets/{dataset_id}/d - * icomStores/{dicom_store_id}`). - * @param string $dicomWebPath The path of the StoreInstances DICOMweb request - * (e.g., `studies/[{study_id}]`). Note that the `study_uid` is optional. - * @param Google_Service_CloudHealthcare_HttpBody $postBody - * @param array $optParams Optional parameters. - * @return Google_Service_CloudHealthcare_HttpBody - */ - public function storeInstances($parent, $dicomWebPath, Google_Service_CloudHealthcare_HttpBody $postBody, $optParams = array()) - { - $params = array('parent' => $parent, 'dicomWebPath' => $dicomWebPath, 'postBody' => $postBody); - $params = array_merge($params, $optParams); - return $this->call('storeInstances', array($params), "Google_Service_CloudHealthcare_HttpBody"); - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsDicomStoresDicomWebStudies.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsDicomStoresStudies.php similarity index 76% rename from vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsDicomStoresDicomWebStudies.php rename to vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsDicomStoresStudies.php index 5a22a1c..d9f1781 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsDicomStoresDicomWebStudies.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsDicomStoresStudies.php @@ -23,18 +23,18 @@ * $studies = $healthcareService->studies; * */ -class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsDicomStoresDicomWebStudies extends Google_Service_Resource +class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsDicomStoresStudies extends Google_Service_Resource { /** * DeleteStudy deletes all instances within the given study. Delete requests are * equivalent to the GET requests specified in the WADO-RS standard. * (studies.delete) * - * @param string $parent The name of the DICOM store that is being accessed - * (e.g., `projects/{project_id}/locations/{location_id}/datasets/{dataset_id}/d - * icomStores/{dicom_store_id}`). - * @param string $dicomWebPath The path of the DeleteStudy request (e.g., - * `studies/{study_id}`). + * @param string $parent The name of the DICOM store that is being accessed (for + * example, `projects/{project_id}/locations/{location_id}/datasets/{dataset_id} + * /dicomStores/{dicom_store_id}`). + * @param string $dicomWebPath The path of the DeleteStudy request (for example, + * `studies/{study_uid}`). * @param array $optParams Optional parameters. * @return Google_Service_CloudHealthcare_HealthcareEmpty */ @@ -47,32 +47,33 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsDicomStor /** * RetrieveStudyMetadata returns instance associated with the given study * presented as metadata with the bulk data removed. See http://dicom.nema.org/m - * edical/dicom/current/output/html/part18.html#sect_10.4. (studies.metadata) + * edical/dicom/current/output/html/part18.html#sect_10.4. + * (studies.retrieveMetadata) * - * @param string $parent The name of the DICOM store that is being accessed - * (e.g., `projects/{project_id}/locations/{location_id}/datasets/{dataset_id}/d - * icomStores/{dicom_store_id}`). + * @param string $parent The name of the DICOM store that is being accessed (for + * example, `projects/{project_id}/locations/{location_id}/datasets/{dataset_id} + * /dicomStores/{dicom_store_id}`). * @param string $dicomWebPath The path of the RetrieveStudyMetadata DICOMweb - * request (e.g., `studies/{study_id}/metadata`). + * request (for example, `studies/{study_uid}/metadata`). * @param array $optParams Optional parameters. * @return Google_Service_CloudHealthcare_HttpBody */ - public function metadata($parent, $dicomWebPath, $optParams = array()) + public function retrieveMetadata($parent, $dicomWebPath, $optParams = array()) { $params = array('parent' => $parent, 'dicomWebPath' => $dicomWebPath); $params = array_merge($params, $optParams); - return $this->call('metadata', array($params), "Google_Service_CloudHealthcare_HttpBody"); + return $this->call('retrieveMetadata', array($params), "Google_Service_CloudHealthcare_HttpBody"); } /** * RetrieveStudy returns all instances within the given study. See http://dicom. * nema.org/medical/dicom/current/output/html/part18.html#sect_10.4. * (studies.retrieveStudy) * - * @param string $parent The name of the DICOM store that is being accessed - * (e.g., `projects/{project_id}/locations/{location_id}/datasets/{dataset_id}/d - * icomStores/{dicom_store_id}`). + * @param string $parent The name of the DICOM store that is being accessed (for + * example, `projects/{project_id}/locations/{location_id}/datasets/{dataset_id} + * /dicomStores/{dicom_store_id}`). * @param string $dicomWebPath The path of the RetrieveStudy DICOMweb request - * (e.g., `studies/{study_id}`). + * (for example, `studies/{study_uid}`). * @param array $optParams Optional parameters. * @return Google_Service_CloudHealthcare_HttpBody */ @@ -87,12 +88,12 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsDicomStor * a.org/medical/dicom/current/output/html/part18.html#sect_10.6. * (studies.searchForInstances) * - * @param string $parent The name of the DICOM store that is being accessed - * (e.g., `projects/{project_id}/locations/{location_id}/datasets/{dataset_id}/d - * icomStores/{dicom_store_id}`). + * @param string $parent The name of the DICOM store that is being accessed (for + * example, `projects/{project_id}/locations/{location_id}/datasets/{dataset_id} + * /dicomStores/{dicom_store_id}`). * @param string $dicomWebPath The path of the SearchForInstancesRequest - * DICOMweb request (e.g., `instances` or `series/{series_uid}/instances` or - * `studies/{study_uid}/instances`). + * DICOMweb request (for example, `instances` or `series/{series_uid}/instances` + * or `studies/{study_uid}/instances`). * @param array $optParams Optional parameters. * @return Google_Service_CloudHealthcare_HttpBody */ @@ -107,11 +108,11 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsDicomStor * medical/dicom/current/output/html/part18.html#sect_10.6. * (studies.searchForSeries) * - * @param string $parent The name of the DICOM store that is being accessed - * (e.g., `projects/{project_id}/locations/{location_id}/datasets/{dataset_id}/d - * icomStores/{dicom_store_id}`). + * @param string $parent The name of the DICOM store that is being accessed (for + * example, `projects/{project_id}/locations/{location_id}/datasets/{dataset_id} + * /dicomStores/{dicom_store_id}`). * @param string $dicomWebPath The path of the SearchForSeries DICOMweb - * request(e.g., `series` or `studies/{study_uid}/series`). + * request(for example, `series` or `studies/{study_uid}/series`). * @param array $optParams Optional parameters. * @return Google_Service_CloudHealthcare_HttpBody */ @@ -126,11 +127,12 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsDicomStor * identifiers (SUID). See http://dicom.nema.org/medical/dicom/current/output/ht * ml/part18.html#sect_10.5. (studies.storeInstances) * - * @param string $parent The name of the DICOM store that is being accessed - * (e.g., `projects/{project_id}/locations/{location_id}/datasets/{dataset_id}/d - * icomStores/{dicom_store_id}`). + * @param string $parent The name of the DICOM store that is being accessed (for + * example, `projects/{project_id}/locations/{location_id}/datasets/{dataset_id} + * /dicomStores/{dicom_store_id}`). * @param string $dicomWebPath The path of the StoreInstances DICOMweb request - * (e.g., `studies/[{study_id}]`). Note that the `study_uid` is optional. + * (for example, `studies/[{study_uid}]`). Note that the `study_uid` is + * optional. * @param Google_Service_CloudHealthcare_HttpBody $postBody * @param array $optParams Optional parameters. * @return Google_Service_CloudHealthcare_HttpBody diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsDicomStoresDicomWebStudiesSeries.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsDicomStoresStudiesSeries.php similarity index 76% rename from vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsDicomStoresDicomWebStudiesSeries.php rename to vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsDicomStoresStudiesSeries.php index 0a875b4..a9a9ffc 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsDicomStoresDicomWebStudiesSeries.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsDicomStoresStudiesSeries.php @@ -23,18 +23,18 @@ * $series = $healthcareService->series; * */ -class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsDicomStoresDicomWebStudiesSeries extends Google_Service_Resource +class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsDicomStoresStudiesSeries extends Google_Service_Resource { /** * DeleteSeries deletes all instances within the given study and series. Delete * requests are equivalent to the GET requests specified in the WADO-RS * standard. (series.delete) * - * @param string $parent The name of the DICOM store that is being accessed - * (e.g., `projects/{project_id}/locations/{location_id}/datasets/{dataset_id}/d - * icomStores/{dicom_store_id}`). - * @param string $dicomWebPath The path of the DeleteSeries request (e.g., - * `studies/{study_id}/series/{series_id}`). + * @param string $parent The name of the DICOM store that is being accessed (for + * example, `projects/{project_id}/locations/{location_id}/datasets/{dataset_id} + * /dicomStores/{dicom_store_id}`). + * @param string $dicomWebPath The path of the DeleteSeries request (for + * example, `studies/{study_uid}/series/{series_uid}`). * @param array $optParams Optional parameters. * @return Google_Service_CloudHealthcare_HealthcareEmpty */ @@ -48,32 +48,32 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsDicomStor * RetrieveSeriesMetadata returns instance associated with the given study and * series, presented as metadata with the bulk data removed. See http://dicom.ne * ma.org/medical/dicom/current/output/html/part18.html#sect_10.4. - * (series.metadata) + * (series.retrieveMetadata) * - * @param string $parent The name of the DICOM store that is being accessed - * (e.g., `projects/{project_id}/locations/{location_id}/datasets/{dataset_id}/d - * icomStores/{dicom_store_id}`). + * @param string $parent The name of the DICOM store that is being accessed (for + * example, `projects/{project_id}/locations/{location_id}/datasets/{dataset_id} + * /dicomStores/{dicom_store_id}`). * @param string $dicomWebPath The path of the RetrieveSeriesMetadata DICOMweb - * request (e.g., `studies/{study_id}/series/{series_id}/metadata`). + * request (for example, `studies/{study_uid}/series/{series_uid}/metadata`). * @param array $optParams Optional parameters. * @return Google_Service_CloudHealthcare_HttpBody */ - public function metadata($parent, $dicomWebPath, $optParams = array()) + public function retrieveMetadata($parent, $dicomWebPath, $optParams = array()) { $params = array('parent' => $parent, 'dicomWebPath' => $dicomWebPath); $params = array_merge($params, $optParams); - return $this->call('metadata', array($params), "Google_Service_CloudHealthcare_HttpBody"); + return $this->call('retrieveMetadata', array($params), "Google_Service_CloudHealthcare_HttpBody"); } /** * RetrieveSeries returns all instances within the given study and series. See h * ttp://dicom.nema.org/medical/dicom/current/output/html/part18.html#sect_10.4. * (series.retrieveSeries) * - * @param string $parent The name of the DICOM store that is being accessed - * (e.g., `projects/{project_id}/locations/{location_id}/datasets/{dataset_id}/d - * icomStores/{dicom_store_id}`). + * @param string $parent The name of the DICOM store that is being accessed (for + * example, `projects/{project_id}/locations/{location_id}/datasets/{dataset_id} + * /dicomStores/{dicom_store_id}`). * @param string $dicomWebPath The path of the RetrieveSeries DICOMweb request - * (e.g., `studies/{study_id}/series/{series_id}`). + * (for example, `studies/{study_uid}/series/{series_uid}`). * @param array $optParams Optional parameters. * @return Google_Service_CloudHealthcare_HttpBody */ @@ -88,12 +88,12 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsDicomStor * a.org/medical/dicom/current/output/html/part18.html#sect_10.6. * (series.searchForInstances) * - * @param string $parent The name of the DICOM store that is being accessed - * (e.g., `projects/{project_id}/locations/{location_id}/datasets/{dataset_id}/d - * icomStores/{dicom_store_id}`). + * @param string $parent The name of the DICOM store that is being accessed (for + * example, `projects/{project_id}/locations/{location_id}/datasets/{dataset_id} + * /dicomStores/{dicom_store_id}`). * @param string $dicomWebPath The path of the SearchForInstancesRequest - * DICOMweb request (e.g., `instances` or `series/{series_uid}/instances` or - * `studies/{study_uid}/instances`). + * DICOMweb request (for example, `instances` or `series/{series_uid}/instances` + * or `studies/{study_uid}/instances`). * @param array $optParams Optional parameters. * @return Google_Service_CloudHealthcare_HttpBody */ diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsDicomStoresDicomWebStudiesSeriesInstances.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsDicomStoresStudiesSeriesInstances.php similarity index 71% rename from vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsDicomStoresDicomWebStudiesSeriesInstances.php rename to vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsDicomStoresStudiesSeriesInstances.php index 93325e1..89e7a4f 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsDicomStoresDicomWebStudiesSeriesInstances.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsDicomStoresStudiesSeriesInstances.php @@ -23,18 +23,18 @@ * $instances = $healthcareService->instances; * */ -class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsDicomStoresDicomWebStudiesSeriesInstances extends Google_Service_Resource +class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsDicomStoresStudiesSeriesInstances extends Google_Service_Resource { /** * DeleteInstance deletes an instance associated with the given study, series, * and SOP Instance UID. Delete requests are equivalent to the GET requests * specified in the WADO-RS standard. (instances.delete) * - * @param string $parent The name of the DICOM store that is being accessed - * (e.g., `projects/{project_id}/locations/{location_id}/datasets/{dataset_id}/d - * icomStores/{dicom_store_id}`). - * @param string $dicomWebPath The path of the DeleteInstance request (e.g., - * `studies/{study_id}/series/{series_id}/instances/{instance_id}`). + * @param string $parent The name of the DICOM store that is being accessed (for + * example, `projects/{project_id}/locations/{location_id}/datasets/{dataset_id} + * /dicomStores/{dicom_store_id}`). + * @param string $dicomWebPath The path of the DeleteInstance request (for + * example, `studies/{study_uid}/series/{series_uid}/instances/{instance_uid}`). * @param array $optParams Optional parameters. * @return Google_Service_CloudHealthcare_HealthcareEmpty */ @@ -44,58 +44,17 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsDicomStor $params = array_merge($params, $optParams); return $this->call('delete', array($params), "Google_Service_CloudHealthcare_HealthcareEmpty"); } - /** - * RetrieveInstanceMetadata returns instance associated with the given study, - * series, and SOP Instance UID presented as metadata with the bulk data - * removed. See http://dicom.nema.org/medical/dicom/current/output/html/part18.h - * tml#sect_10.4. (instances.metadata) - * - * @param string $parent The name of the DICOM store that is being accessed - * (e.g., `projects/{project_id}/locations/{location_id}/datasets/{dataset_id}/d - * icomStores/{dicom_store_id}`). - * @param string $dicomWebPath The path of the RetrieveInstanceMetadata DICOMweb - * request (e.g., - * `studies/{study_id}/series/{series_id}/instances/{instance_id}/metadata`). - * @param array $optParams Optional parameters. - * @return Google_Service_CloudHealthcare_HttpBody - */ - public function metadata($parent, $dicomWebPath, $optParams = array()) - { - $params = array('parent' => $parent, 'dicomWebPath' => $dicomWebPath); - $params = array_merge($params, $optParams); - return $this->call('metadata', array($params), "Google_Service_CloudHealthcare_HttpBody"); - } - /** - * RetrieveRenderedInstance returns instance associated with the given study, - * series, and SOP Instance UID in an acceptable Rendered Media Type. See http:/ - * /dicom.nema.org/medical/dicom/current/output/html/part18.html#sect_10.4. - * (instances.rendered) - * - * @param string $parent The name of the DICOM store that is being accessed - * (e.g., `projects/{project_id}/locations/{location_id}/datasets/{dataset_id}/d - * icomStores/{dicom_store_id}`). - * @param string $dicomWebPath The path of the RetrieveRenderedInstance DICOMweb - * request (e.g., - * `studies/{study_id}/series/{series_id}/instances/{instance_id}/rendered`). - * @param array $optParams Optional parameters. - * @return Google_Service_CloudHealthcare_HttpBody - */ - public function rendered($parent, $dicomWebPath, $optParams = array()) - { - $params = array('parent' => $parent, 'dicomWebPath' => $dicomWebPath); - $params = array_merge($params, $optParams); - return $this->call('rendered', array($params), "Google_Service_CloudHealthcare_HttpBody"); - } /** * RetrieveInstance returns instance associated with the given study, series, * and SOP Instance UID. See http://dicom.nema.org/medical/dicom/current/output/ * html/part18.html#sect_10.4. (instances.retrieveInstance) * - * @param string $parent The name of the DICOM store that is being accessed - * (e.g., `projects/{project_id}/locations/{location_id}/datasets/{dataset_id}/d - * icomStores/{dicom_store_id}`). + * @param string $parent The name of the DICOM store that is being accessed (for + * example, `projects/{project_id}/locations/{location_id}/datasets/{dataset_id} + * /dicomStores/{dicom_store_id}`). * @param string $dicomWebPath The path of the RetrieveInstance DICOMweb request - * (e.g., `studies/{study_id}/series/{series_id}/instances/{instance_id}`). + * (for example, + * `studies/{study_uid}/series/{series_uid}/instances/{instance_uid}`). * @param array $optParams Optional parameters. * @return Google_Service_CloudHealthcare_HttpBody */ @@ -105,4 +64,46 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsDicomStor $params = array_merge($params, $optParams); return $this->call('retrieveInstance', array($params), "Google_Service_CloudHealthcare_HttpBody"); } + /** + * RetrieveInstanceMetadata returns instance associated with the given study, + * series, and SOP Instance UID presented as metadata with the bulk data + * removed. See http://dicom.nema.org/medical/dicom/current/output/html/part18.h + * tml#sect_10.4. (instances.retrieveMetadata) + * + * @param string $parent The name of the DICOM store that is being accessed (for + * example, `projects/{project_id}/locations/{location_id}/datasets/{dataset_id} + * /dicomStores/{dicom_store_id}`). + * @param string $dicomWebPath The path of the RetrieveInstanceMetadata DICOMweb + * request (for example, + * `studies/{study_uid}/series/{series_uid}/instances/{instance_uid}/metadata`). + * @param array $optParams Optional parameters. + * @return Google_Service_CloudHealthcare_HttpBody + */ + public function retrieveMetadata($parent, $dicomWebPath, $optParams = array()) + { + $params = array('parent' => $parent, 'dicomWebPath' => $dicomWebPath); + $params = array_merge($params, $optParams); + return $this->call('retrieveMetadata', array($params), "Google_Service_CloudHealthcare_HttpBody"); + } + /** + * RetrieveRenderedInstance returns instance associated with the given study, + * series, and SOP Instance UID in an acceptable Rendered Media Type. See http:/ + * /dicom.nema.org/medical/dicom/current/output/html/part18.html#sect_10.4. + * (instances.retrieveRendered) + * + * @param string $parent The name of the DICOM store that is being accessed (for + * example, `projects/{project_id}/locations/{location_id}/datasets/{dataset_id} + * /dicomStores/{dicom_store_id}`). + * @param string $dicomWebPath The path of the RetrieveRenderedInstance DICOMweb + * request (for example, + * `studies/{study_uid}/series/{series_uid}/instances/{instance_uid}/rendered`). + * @param array $optParams Optional parameters. + * @return Google_Service_CloudHealthcare_HttpBody + */ + public function retrieveRendered($parent, $dicomWebPath, $optParams = array()) + { + $params = array('parent' => $parent, 'dicomWebPath' => $dicomWebPath); + $params = array_merge($params, $optParams); + return $this->call('retrieveRendered', array($params), "Google_Service_CloudHealthcare_HttpBody"); + } } diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsDicomStoresDicomWebStudiesSeriesInstancesFrames.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsDicomStoresStudiesSeriesInstancesFrames.php similarity index 73% rename from vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsDicomStoresDicomWebStudiesSeriesInstancesFrames.php rename to vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsDicomStoresStudiesSeriesInstancesFrames.php index ace46c1..6947de3 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsDicomStoresDicomWebStudiesSeriesInstancesFrames.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsDicomStoresStudiesSeriesInstancesFrames.php @@ -23,40 +23,19 @@ * $frames = $healthcareService->frames; * */ -class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsDicomStoresDicomWebStudiesSeriesInstancesFrames extends Google_Service_Resource +class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsDicomStoresStudiesSeriesInstancesFrames extends Google_Service_Resource { - /** - * RetrieveRenderedFrames returns instances associated with the given study, - * series, SOP Instance UID and frame numbers in an acceptable Rendered Media - * Type. See http://dicom.nema.org/medical/dicom/current/output/html/part18.html - * #sect_10.4. (frames.rendered) - * - * @param string $parent The name of the DICOM store that is being accessed - * (e.g., `projects/{project_id}/locations/{location_id}/datasets/{dataset_id}/d - * icomStores/{dicom_store_id}`). - * @param string $dicomWebPath The path of the RetrieveRenderedFrames DICOMweb - * request (e.g., `studies/{study_id}/series/{series_id}/instances/{instance_id} - * /frames/{frame_list}/rendered`). - * @param array $optParams Optional parameters. - * @return Google_Service_CloudHealthcare_HttpBody - */ - public function rendered($parent, $dicomWebPath, $optParams = array()) - { - $params = array('parent' => $parent, 'dicomWebPath' => $dicomWebPath); - $params = array_merge($params, $optParams); - return $this->call('rendered', array($params), "Google_Service_CloudHealthcare_HttpBody"); - } /** * RetrieveFrames returns instances associated with the given study, series, SOP * Instance UID and frame numbers. See http://dicom.nema.org/medical/dicom/curre * nt/output/html/part18.html#sect_10.4. (frames.retrieveFrames) * - * @param string $parent The name of the DICOM store that is being accessed - * (e.g., `projects/{project_id}/locations/{location_id}/datasets/{dataset_id}/d - * icomStores/{dicom_store_id}`). + * @param string $parent The name of the DICOM store that is being accessed (for + * example, `projects/{project_id}/locations/{location_id}/datasets/{dataset_id} + * /dicomStores/{dicom_store_id}`). * @param string $dicomWebPath The path of the RetrieveFrames DICOMweb request - * (e.g., `studies/{study_id}/series/{series_id}/instances/{instance_id}/frames/ - * {frame_list}`). + * (for example, `studies/{study_uid}/series/{series_uid}/instances/{instance_ui + * d}/frames/{frame_list}`). * @param array $optParams Optional parameters. * @return Google_Service_CloudHealthcare_HttpBody */ @@ -66,4 +45,25 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsDicomStor $params = array_merge($params, $optParams); return $this->call('retrieveFrames', array($params), "Google_Service_CloudHealthcare_HttpBody"); } + /** + * RetrieveRenderedFrames returns instances associated with the given study, + * series, SOP Instance UID and frame numbers in an acceptable Rendered Media + * Type. See http://dicom.nema.org/medical/dicom/current/output/html/part18.html + * #sect_10.4. (frames.retrieveRendered) + * + * @param string $parent The name of the DICOM store that is being accessed (for + * example, `projects/{project_id}/locations/{location_id}/datasets/{dataset_id} + * /dicomStores/{dicom_store_id}`). + * @param string $dicomWebPath The path of the RetrieveRenderedFrames DICOMweb + * request (for example, `studies/{study_uid}/series/{series_uid}/instances/{ins + * tance_uid}/frames/{frame_list}/rendered`). + * @param array $optParams Optional parameters. + * @return Google_Service_CloudHealthcare_HttpBody + */ + public function retrieveRendered($parent, $dicomWebPath, $optParams = array()) + { + $params = array('parent' => $parent, 'dicomWebPath' => $dicomWebPath); + $params = array_merge($params, $optParams); + return $this->call('retrieveRendered', array($params), "Google_Service_CloudHealthcare_HttpBody"); + } } diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsFhirStores.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsFhirStores.php index 11fc5c1..fc50c97 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsFhirStores.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsFhirStores.php @@ -25,27 +25,6 @@ */ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsFhirStores extends Google_Service_Resource { - /** - * Gets the FHIR [capability statement](http://hl7.org/implement/standards/fhir/ - * STU3/capabilitystatement.html) for the store, which contains a description of - * functionality supported by the server. - * - * Implements the FHIR standard [capabilities interaction](http://hl7.org/implem - * ent/standards/fhir/STU3/http.html#capabilities). - * - * On success, the response body will contain a JSON-encoded representation of a - * `CapabilityStatement` resource. (fhirStores.capabilities) - * - * @param string $name Name of the FHIR store to retrieve the capabilities for. - * @param array $optParams Optional parameters. - * @return Google_Service_CloudHealthcare_HttpBody - */ - public function capabilities($name, $optParams = array()) - { - $params = array('name' => $name); - $params = array_merge($params, $optParams); - return $this->call('capabilities', array($params), "Google_Service_CloudHealthcare_HttpBody"); - } /** * Creates a new FHIR store within the parent dataset. (fhirStores.create) * @@ -83,10 +62,11 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsFhirStore * This method returns an Operation that can be used to track the status of the * export by calling GetOperation. * - * Immediate fatal errors appear in the error field. Otherwise, when the - * operation finishes, a detailed response of type ExportResourcesResponse is - * returned in the response field. The metadata field type for this operation is - * OperationMetadata. (fhirStores.export) + * Immediate fatal errors appear in the error field, errors are also logged to + * Stackdriver (see [Viewing logs](/healthcare/docs/how-tos/stackdriver- + * logging)). Otherwise, when the operation finishes, a detailed response of + * type ExportResourcesResponse is returned in the response field. The metadata + * field type for this operation is OperationMetadata. (fhirStores.export) * * @param string $name The name of the FHIR store to export resource from. The * name should be in the format of `projects/{project_id}/locations/{location_id @@ -124,8 +104,14 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsFhirStore * @param array $optParams Optional parameters. * * @opt_param int options.requestedPolicyVersion Optional. The policy format - * version to be returned. Acceptable values are 0 and 1. If the value is 0, or - * the field is omitted, policy format version 1 will be returned. + * version to be returned. + * + * Valid values are 0, 1, and 3. Requests specifying an invalid value will be + * rejected. + * + * Requests for policies with any conditional bindings must specify version 3. + * Policies without any conditional bindings may specify any valid value or + * leave the field unset. * @return Google_Service_CloudHealthcare_Policy */ public function getIamPolicy($resource, $optParams = array()) @@ -176,7 +162,7 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsFhirStore * The location and format of the input data is specified by the parameters * below. Note that if no format is specified, this method assumes the `BUNDLE` * format. When using the `BUNDLE` format this method ignores the `Bundle.type` - * field, except for the special case of `history`, and does not apply any of + * field, except that `history` bundles are rejected, and does not apply any of * the bundle processing semantics for batch or transaction bundles. Unlike in * ExecuteBundle, transaction bundles are not executed as a single transaction * and bundle-internal references are not rewritten. The bundle is treated as a @@ -185,22 +171,14 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsFhirStore * `searchset` bundles produced by a FHIR search or Patient-everything * operation. * - * If history imports are enabled by setting enable_history_import in the FHIR - * store's configuration, this method can import historical versions of a - * resource by supplying a bundle of type `history` and using the `BUNDLE` - * format. The historical versions in the bundle must have `lastUpdated` - * timestamps, and the resulting resource history on the server will appear as - * if the versions had been created at those timestamps. If a current or - * historical version with the supplied resource ID already exists, the bundle - * is rejected to avoid creating an inconsistent sequence of resource versions. - * * This method returns an Operation that can be used to track the status of the * import by calling GetOperation. * - * Immediate fatal errors appear in the error field. Otherwise, when the - * operation finishes, a detailed response of type ImportResourcesResponse is - * returned in the response field. The metadata field type for this operation is - * OperationMetadata. (fhirStores.import) + * Immediate fatal errors appear in the error field, errors are also logged to + * Stackdriver (see [Viewing logs](/healthcare/docs/how-tos/stackdriver- + * logging)). Otherwise, when the operation finishes, a detailed response of + * type ImportResourcesResponse is returned in the response field. The metadata + * field type for this operation is OperationMetadata. (fhirStores.import) * * @param string $name The name of the FHIR store to import FHIR resources to. * The name should be in the format of `projects/{project_id}/locations/{locatio diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsFhirStoresFhir.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsFhirStoresFhir.php index 274652a..8433552 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsFhirStoresFhir.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsFhirStoresFhir.php @@ -57,8 +57,8 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsFhirStore return $this->call('Observation-lastn', array($params), "Google_Service_CloudHealthcare_HttpBody"); } /** - * Retrieves all the resources in the patient compartment for a `Patient` - * resource. + * Retrieves all the resources directly referenced by a patient, as well as all + * of the resources in the patient compartment. * * Implements the FHIR extended operation [Patient- * everything](http://hl7.org/implement/standards/fhir/STU3/patient- @@ -75,12 +75,20 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsFhirStore * is required. * @param array $optParams Optional parameters. * - * @opt_param string start The response includes records subsequent to the start - * date. If no start date is provided, all records prior to the end date are in - * scope. * @opt_param string end The response includes records prior to the end date. If * no end date is provided, all records subsequent to the start date are in * scope. + * @opt_param int _count Maximum number of resources in a page. Defaults to 100. + * @opt_param string pageToken Used to retrieve the next or previous page of + * results when using pagination. Value should be set to the value of page_token + * set in next or previous page links' urls. Next and previous page are returned + * in the response bundle's links field, where `link.relation` is "previous" or + * "next". + * + * Omit `page_token` if no previous request has been made. + * @opt_param string start The response includes records subsequent to the start + * date. If no start date is provided, all records prior to the end date are in + * scope. * @return Google_Service_CloudHealthcare_HttpBody */ public function PatientEverything($name, $optParams = array()) @@ -352,12 +360,6 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsFhirStore * @param string $name The name of the resource to retrieve. * @param array $optParams Optional parameters. * - * @opt_param string page Used to retrieve the first, previous, next, or last - * page of resource versions when using pagination. Value should be set to the - * value of the `link.url` field returned in the response to the previous - * request, where `link.relation` is "first", "previous", "next" or "last". - * - * Omit `page` if no previous request has been made. * @opt_param string at Only include resource versions that were current at some * point during the time period specified in the date time value. The date * parameter format is yyyy-mm-ddThh:mm:ss[Z|(+|-)hh:mm] @@ -368,6 +370,15 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsFhirStore * day: `_at=2019-01-20` * A specific second: `_at=2018-12-31T23:59:58Z` * @opt_param int count The maximum number of search results on a page. Defaults * to 1000. + * @opt_param string page Used to retrieve the first, previous, next, or last + * page of resource versions when using pagination. Value should be set to the + * value of `page` set in next or previous page links' URLs. Next and previous + * page are returned in the response bundle's links field, where `link.relation` + * is "previous" or "next". + * + * Omit `page` if no previous request has been made. + * @opt_param string _page_token Same as `page`. Please use either `page` or + * `_page_token`. * @opt_param string since Only include resource versions that were created at * or after the given instant in time. The instant in time uses the format YYYY- * MM-DDThh:mm:ss.sss+zz:zz (for example 2015-02-07T13:28:17.239+02:00 or diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsHl7V2Stores.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsHl7V2Stores.php index 5fd6d5c..35afa11 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsHl7V2Stores.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsHl7V2Stores.php @@ -80,8 +80,14 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsHl7V2Stor * @param array $optParams Optional parameters. * * @opt_param int options.requestedPolicyVersion Optional. The policy format - * version to be returned. Acceptable values are 0 and 1. If the value is 0, or - * the field is omitted, policy format version 1 will be returned. + * version to be returned. + * + * Valid values are 0, 1, and 3. Requests specifying an invalid value will be + * rejected. + * + * Requests for policies with any conditional bindings must specify version 3. + * Policies without any conditional bindings may specify any valid value or + * leave the field unset. * @return Google_Service_CloudHealthcare_Policy */ public function getIamPolicy($resource, $optParams = array()) @@ -97,14 +103,14 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsHl7V2Stor * @param string $parent Name of the dataset. * @param array $optParams Optional parameters. * - * @opt_param string filter Restricts stores returned to those matching a - * filter. Syntax: - * https://cloud.google.com/appengine/docs/standard/python/search/query_strings - * Only filtering on labels is supported, for example `labels.key=value`. * @opt_param string pageToken The next_page_token value returned from the * previous List request, if any. * @opt_param int pageSize Limit on the number of HL7v2 stores to return in a * single response. If zero the default page size of 100 is used. + * @opt_param string filter Restricts stores returned to those matching a + * filter. Syntax: + * https://cloud.google.com/appengine/docs/standard/python/search/query_strings + * Only filtering on labels is supported. For example, `labels.key=value`. * @return Google_Service_CloudHealthcare_ListHl7V2StoresResponse */ public function listProjectsLocationsDatasetsHl7V2Stores($parent, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsHl7V2StoresMessages.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsHl7V2StoresMessages.php index 02cd28d..ae9c02b 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsHl7V2StoresMessages.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsHl7V2StoresMessages.php @@ -63,8 +63,8 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsHl7V2Stor * @param string $name The resource name of the HL7v2 message to retrieve. * @param array $optParams Optional parameters. * - * @opt_param string view Specifies which parts of the Message resource should - * be returned in the response. + * @opt_param string view Specifies which parts of the Message resource to + * return in the response. * @return Google_Service_CloudHealthcare_Message */ public function get($name, $optParams = array()) @@ -101,6 +101,42 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsHl7V2Stor * @param string $parent Name of the HL7v2 store to retrieve messages from. * @param array $optParams Optional parameters. * + * @opt_param string filter Restricts messages returned to those matching a + * filter. Syntax: + * https://cloud.google.com/appengine/docs/standard/python/search/query_strings + * + * Fields/functions available for filtering are: + * + * * `message_type`, from the MSH-9 segment. For example, `NOT message_type = + * "ADT"`. * `send_date` or `sendDate`, the YYYY-MM-DD date the message was + * sent in the dataset's time_zone, from the MSH-7 segment. For example, + * `send_date < "2017-01-02"`. * `send_time`, the timestamp when the message + * was sent, using the RFC3339 time format for comparisons, from the MSH-7 + * segment. For example, `send_time < "2017-01-02T00:00:00-05:00"`. * + * `send_facility`, the care center that the message came from, from the MSH-4 + * segment. For example, `send_facility = "ABC"`. * `HL7RegExp(expr)`, which + * does regular expression matching of `expr` against the message payload using + * RE2 syntax (https://github.com/google/re2/wiki/Syntax). For example, + * `HL7RegExp("^.*\|.*\|EMERG")`. * `PatientId(value, type)`, which matches if + * the message lists a patient having an ID of the given value and type in the + * PID-2, PID-3, or PID-4 segments. For example, `PatientId("123456", "MRN")`. * + * `labels.x`, a string value of the label with key `x` as set using the + * Message.labels map. For example, `labels."priority"="high"`. The operator + * `:*` can be used to assert the existence of a label. For example, + * `labels."priority":*`. + * + * Limitations on conjunctions: + * + * * Negation on the patient ID function or the labels field is not supported. + * For example, these queries are invalid: `NOT PatientId("123456", "MRN")`, + * `NOT labels."tag1":*`, `NOT labels."tag2"="val2"`. * Conjunction of multiple + * patient ID functions is not supported, for example this query is invalid: + * `PatientId("123456", "MRN") AND PatientId("456789", "MRN")`. * Conjunction + * of multiple labels fields is also not supported, for example this query is + * invalid: `labels."tag1":* AND labels."tag2"="val2"`. * Conjunction of one + * patient ID function, one labels field and conditions on other fields is + * supported. For example, this query is valid: `PatientId("123456", "MRN") AND + * labels."tag1":* AND message_type = "ADT"`. * @opt_param string pageToken The next_page_token value returned from the * previous List request, if any. * @opt_param string orderBy Orders messages returned by the specified order_by @@ -112,45 +148,6 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsHl7V2Stor * * `send_time` * @opt_param int pageSize Limit on the number of messages to return in a single * response. If zero the default page size of 100 is used. - * @opt_param string filter Restricts messages returned to those matching a - * filter. Syntax: - * https://cloud.google.com/appengine/docs/standard/python/search/query_strings - * - * Fields/functions available for filtering are: - * - * * `message_type`, from the MSH-9 segment; for example `NOT message_type = - * "ADT"` * `send_date` or `sendDate`, the YYYY-MM-DD date the message was sent - * in the dataset's time_zone, from the MSH-7 segment; for example `send_date < - * "2017-01-02"` * `send_time`, the timestamp when the message was sent, using - * the RFC3339 time format for comparisons, from the MSH-7 segment; for example - * `send_time < "2017-01-02T00:00:00-05:00"` * `send_facility`, the care center - * that the message came from, from the MSH-4 segment; for example - * `send_facility = "ABC"` * `HL7RegExp(expr)`, which does regular expression - * matching of `expr` against the message payload using re2 - * (http://code.google.com/p/re2/) syntax; for example - * `HL7RegExp("^.*\|.*\|EMERG")` * `PatientId(value, type)`, which matches if - * the message lists a patient having an ID of the given value and type in the - * PID-2, PID-3, or PID-4 segments; for example `PatientId("123456", "MRN")` * - * `labels.x`, a string value of the label with key `x` as set using the - * Message.labels map, for example `labels."priority"="high"`. The operator `:*` - * can be used to assert the existence of a label, for example - * `labels."priority":*`. - * - * Limitations on conjunctions: - * - * * Negation on the patient ID function or the labels field is not supported, - * for example these queries are invalid: `NOT PatientId("123456", "MRN")`, `NOT - * labels."tag1":*`, `NOT labels."tag2"="val2"`. * Conjunction of multiple - * patient ID functions is not supported, for example this query is invalid: - * `PatientId("123456", "MRN") AND PatientId("456789", "MRN")`. * Conjunction - * of multiple labels fields is also not supported, for example this query is - * invalid: `labels."tag1":* AND labels."tag2"="val2"`. * Conjunction of one - * patient ID function, one labels field and conditions on other fields is - * supported, for example this query is valid: `PatientId("123456", "MRN") AND - * labels."tag1":* AND message_type = "ADT"`. - * - * The HasLabel(x) and Label(x) syntax from previous API versions are - * deprecated; replaced by the `labels.x` syntax. * @return Google_Service_CloudHealthcare_ListMessagesResponse */ public function listProjectsLocationsDatasetsHl7V2StoresMessages($parent, $optParams = array()) @@ -171,8 +168,8 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsHl7V2Stor * @opt_param string updateMask The update mask applies to the resource. For the * `FieldMask` definition, see https://developers.google.com/protocol- * buffers/docs/reference/google.protobuf#fieldmask Only the `labels` field is - * allowed to be updated. The labels in the request will be merged with the - * existing set of labels. Existing labels with the same keys will be updated. + * allowed to be updated. The labels in the request are merged with the existing + * set of labels. Existing labels with the same keys are updated. * @return Google_Service_CloudHealthcare_Message */ public function patch($name, Google_Service_CloudHealthcare_Message $postBody, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsOperations.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsOperations.php index 4fa59d3..eb490d3 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsOperations.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Resource/ProjectsLocationsDatasetsOperations.php @@ -56,9 +56,9 @@ class Google_Service_CloudHealthcare_Resource_ProjectsLocationsDatasetsOperation * @param string $name The name of the operation's parent resource. * @param array $optParams Optional parameters. * + * @opt_param string filter The standard list filter. * @opt_param string pageToken The standard list page token. * @opt_param int pageSize The standard list page size. - * @opt_param string filter The standard list filter. * @return Google_Service_CloudHealthcare_ListOperationsResponse */ public function listProjectsLocationsDatasetsOperations($name, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/StreamConfig.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/StreamConfig.php deleted file mode 100644 index 8077ce8..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/StreamConfig.php +++ /dev/null @@ -1,47 +0,0 @@ -bigqueryDestination = $bigqueryDestination; - } - /** - * @return Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2FhirBigQueryDestination - */ - public function getBigqueryDestination() - { - return $this->bigqueryDestination; - } - public function setResourceTypes($resourceTypes) - { - $this->resourceTypes = $resourceTypes; - } - public function getResourceTypes() - { - return $this->resourceTypes; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/SubscriptionConfig.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/SubscriptionConfig.php deleted file mode 100644 index cb044c7..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/SubscriptionConfig.php +++ /dev/null @@ -1,38 +0,0 @@ -allowedRestHookEndpoints = $allowedRestHookEndpoints; - } - /** - * @return Google_Service_CloudHealthcare_SubscriptionRestHookEndpoint - */ - public function getAllowedRestHookEndpoints() - { - return $this->allowedRestHookEndpoints; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/SubscriptionRestHookEndpoint.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/SubscriptionRestHookEndpoint.php deleted file mode 100644 index be94598..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/SubscriptionRestHookEndpoint.php +++ /dev/null @@ -1,39 +0,0 @@ -allowResourcePayload = $allowResourcePayload; - } - public function getAllowResourcePayload() - { - return $this->allowResourcePayload; - } - public function setEndpoint($endpoint) - { - $this->endpoint = $endpoint; - } - public function getEndpoint() - { - return $this->endpoint; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/ValidationConfig.php b/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/ValidationConfig.php deleted file mode 100644 index 0dd5eb3..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/ValidationConfig.php +++ /dev/null @@ -1,40 +0,0 @@ -disableProfileValidation = $disableProfileValidation; - } - public function getDisableProfileValidation() - { - return $this->disableProfileValidation; - } - public function setEnabledImplementationGuides($enabledImplementationGuides) - { - $this->enabledImplementationGuides = $enabledImplementationGuides; - } - public function getEnabledImplementationGuides() - { - return $this->enabledImplementationGuides; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudIdentity.php b/vendor/google/apiclient-services/src/Google/Service/CloudIdentity.php index d93717e..46c5598 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudIdentity.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudIdentity.php @@ -36,6 +36,9 @@ class Google_Service_CloudIdentity extends Google_Service /** See any Cloud Identity Groups that you can access, including group members and their emails. */ const CLOUD_IDENTITY_GROUPS_READONLY = "https://www.googleapis.com/auth/cloud-identity.groups.readonly"; + /** View and manage your data across Google Cloud Platform services. */ + const CLOUD_PLATFORM = + "https://www.googleapis.com/auth/cloud-platform"; public $groups; public $groups_memberships; @@ -89,10 +92,6 @@ class Google_Service_CloudIdentity extends Google_Service 'path' => 'v1/groups', 'httpMethod' => 'GET', 'parameters' => array( - 'pageToken' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageSize' => array( 'location' => 'query', 'type' => 'integer', @@ -105,16 +104,20 @@ class Google_Service_CloudIdentity extends Google_Service 'location' => 'query', 'type' => 'string', ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'lookup' => array( 'path' => 'v1/groups:lookup', 'httpMethod' => 'GET', 'parameters' => array( - 'groupKey.id' => array( + 'groupKey.namespace' => array( 'location' => 'query', 'type' => 'string', ), - 'groupKey.namespace' => array( + 'groupKey.id' => array( 'location' => 'query', 'type' => 'string', ), @@ -203,6 +206,10 @@ class Google_Service_CloudIdentity extends Google_Service 'type' => 'string', 'required' => true, ), + 'view' => array( + 'location' => 'query', + 'type' => 'string', + ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -211,10 +218,6 @@ class Google_Service_CloudIdentity extends Google_Service 'location' => 'query', 'type' => 'integer', ), - 'view' => array( - 'location' => 'query', - 'type' => 'string', - ), ), ),'lookup' => array( 'path' => 'v1/{+parent}/memberships:lookup', diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudIdentity/Resource/Groups.php b/vendor/google/apiclient-services/src/Google/Service/CloudIdentity/Resource/Groups.php index 7936d69..f831015 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudIdentity/Resource/Groups.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudIdentity/Resource/Groups.php @@ -75,14 +75,14 @@ class Google_Service_CloudIdentity_Resource_Groups extends Google_Service_Resour * * @param array $optParams Optional parameters. * - * @opt_param string pageToken The next_page_token value returned from a - * previous list request, if any. * @opt_param int pageSize The default page size is 200 (max 1000) for the BASIC * view, and 50 (max 500) for the FULL view. * @opt_param string view Group resource view to be returned. Defaults to * [View.BASIC](). * @opt_param string parent `Required`. May be made Optional in the future. * Customer ID to list all groups from. + * @opt_param string pageToken The next_page_token value returned from a + * previous list request, if any. * @return Google_Service_CloudIdentity_ListGroupsResponse */ public function listGroups($optParams = array()) @@ -97,14 +97,14 @@ class Google_Service_CloudIdentity_Resource_Groups extends Google_Service_Resour * * @param array $optParams Optional parameters. * - * @opt_param string groupKey.id The ID of the entity within the given - * namespace. The ID must be unique within its namespace. * @opt_param string groupKey.namespace Namespaces provide isolation for IDs, so * an ID only needs to be unique within its namespace. * * Namespaces are currently only created as part of IdentitySource creation from * Admin Console. A namespace `"identitysources/{identity_source_id}"` is * created corresponding to every Identity Source `identity_source_id`. + * @opt_param string groupKey.id The ID of the entity within the given + * namespace. The ID must be unique within its namespace. * @return Google_Service_CloudIdentity_LookupGroupNameResponse */ public function lookup($optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudIdentity/Resource/GroupsMemberships.php b/vendor/google/apiclient-services/src/Google/Service/CloudIdentity/Resource/GroupsMemberships.php index e56c236..02d7107 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudIdentity/Resource/GroupsMemberships.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudIdentity/Resource/GroupsMemberships.php @@ -91,12 +91,12 @@ class Google_Service_CloudIdentity_Resource_GroupsMemberships extends Google_Ser * the Group. * @param array $optParams Optional parameters. * + * @opt_param string view Membership resource view to be returned. Defaults to + * View.BASIC. * @opt_param string pageToken The next_page_token value returned from a * previous list request, if any. * @opt_param int pageSize The default page size is 200 (max 1000) for the BASIC * view, and 50 (max 500) for the FULL view. - * @opt_param string view Membership resource view to be returned. Defaults to - * View.BASIC. * @return Google_Service_CloudIdentity_ListMembershipsResponse */ public function listGroupsMemberships($parent, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudIot.php b/vendor/google/apiclient-services/src/Google/Service/CloudIot.php index b549730..f35f5b3 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudIot.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudIot.php @@ -231,7 +231,11 @@ class Google_Service_CloudIot extends Google_Service 'type' => 'string', 'required' => true, ), - 'deviceNumIds' => array( + 'pageSize' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'deviceIds' => array( 'location' => 'query', 'type' => 'string', 'repeated' => true, @@ -240,6 +244,11 @@ class Google_Service_CloudIot extends Google_Service 'location' => 'query', 'type' => 'string', ), + 'deviceNumIds' => array( + 'location' => 'query', + 'type' => 'string', + 'repeated' => true, + ), 'gatewayListOptions.gatewayType' => array( 'location' => 'query', 'type' => 'string', @@ -248,22 +257,13 @@ class Google_Service_CloudIot extends Google_Service 'location' => 'query', 'type' => 'string', ), - 'pageToken' => array( - 'location' => 'query', - 'type' => 'string', - ), 'fieldMask' => array( 'location' => 'query', 'type' => 'string', ), - 'pageSize' => array( - 'location' => 'query', - 'type' => 'integer', - ), - 'deviceIds' => array( + 'pageToken' => array( 'location' => 'query', 'type' => 'string', - 'repeated' => true, ), ), ),'modifyCloudToDeviceConfig' => array( diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudIot/Resource/ProjectsLocationsRegistries.php b/vendor/google/apiclient-services/src/Google/Service/CloudIot/Resource/ProjectsLocationsRegistries.php index dc444af..b7758f5 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudIot/Resource/ProjectsLocationsRegistries.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudIot/Resource/ProjectsLocationsRegistries.php @@ -28,8 +28,8 @@ class Google_Service_CloudIot_Resource_ProjectsLocationsRegistries extends Googl /** * Associates the device with the gateway. (registries.bindDeviceToGateway) * - * @param string $parent The name of the registry. For example, `projects - * /example-project/locations/us-central1/registries/my-registry`. + * @param string $parent Required. The name of the registry. For example, + * `projects/example-project/locations/us-central1/registries/my-registry`. * @param Google_Service_CloudIot_BindDeviceToGatewayRequest $postBody * @param array $optParams Optional parameters. * @return Google_Service_CloudIot_BindDeviceToGatewayResponse @@ -43,9 +43,9 @@ class Google_Service_CloudIot_Resource_ProjectsLocationsRegistries extends Googl /** * Creates a device registry that contains devices. (registries.create) * - * @param string $parent The project and cloud region where this device registry - * must be created. For example, `projects/example-project/locations/us- - * central1`. + * @param string $parent Required. The project and cloud region where this + * device registry must be created. For example, `projects/example- + * project/locations/us-central1`. * @param Google_Service_CloudIot_DeviceRegistry $postBody * @param array $optParams Optional parameters. * @return Google_Service_CloudIot_DeviceRegistry @@ -59,8 +59,8 @@ class Google_Service_CloudIot_Resource_ProjectsLocationsRegistries extends Googl /** * Deletes a device registry configuration. (registries.delete) * - * @param string $name The name of the device registry. For example, `projects - * /example-project/locations/us-central1/registries/my-registry`. + * @param string $name Required. The name of the device registry. For example, + * `projects/example-project/locations/us-central1/registries/my-registry`. * @param array $optParams Optional parameters. * @return Google_Service_CloudIot_CloudiotEmpty */ @@ -73,8 +73,8 @@ class Google_Service_CloudIot_Resource_ProjectsLocationsRegistries extends Googl /** * Gets a device registry configuration. (registries.get) * - * @param string $name The name of the device registry. For example, `projects - * /example-project/locations/us-central1/registries/my-registry`. + * @param string $name Required. The name of the device registry. For example, + * `projects/example-project/locations/us-central1/registries/my-registry`. * @param array $optParams Optional parameters. * @return Google_Service_CloudIot_DeviceRegistry */ @@ -104,8 +104,8 @@ class Google_Service_CloudIot_Resource_ProjectsLocationsRegistries extends Googl /** * Lists device registries. (registries.listProjectsLocationsRegistries) * - * @param string $parent The project and cloud region path. For example, - * `projects/example-project/locations/us-central1`. + * @param string $parent Required. The project and cloud region path. For + * example, `projects/example-project/locations/us-central1`. * @param array $optParams Optional parameters. * * @opt_param int pageSize The maximum number of registries to return in the @@ -132,9 +132,9 @@ class Google_Service_CloudIot_Resource_ProjectsLocationsRegistries extends Googl * @param Google_Service_CloudIot_DeviceRegistry $postBody * @param array $optParams Optional parameters. * - * @opt_param string updateMask Only updates the `device_registry` fields - * indicated by this mask. The field mask must not be empty, and it must not - * contain fields that are immutable or only set by the server. Mutable top- + * @opt_param string updateMask Required. Only updates the `device_registry` + * fields indicated by this mask. The field mask must not be empty, and it must + * not contain fields that are immutable or only set by the server. Mutable top- * level fields: `event_notification_config`, `http_config`, `mqtt_config`, and * `state_notification_config`. * @return Google_Service_CloudIot_DeviceRegistry @@ -184,8 +184,8 @@ class Google_Service_CloudIot_Resource_ProjectsLocationsRegistries extends Googl * Deletes the association between the device and the gateway. * (registries.unbindDeviceFromGateway) * - * @param string $parent The name of the registry. For example, `projects - * /example-project/locations/us-central1/registries/my-registry`. + * @param string $parent Required. The name of the registry. For example, + * `projects/example-project/locations/us-central1/registries/my-registry`. * @param Google_Service_CloudIot_UnbindDeviceFromGatewayRequest $postBody * @param array $optParams Optional parameters. * @return Google_Service_CloudIot_UnbindDeviceFromGatewayResponse diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudIot/Resource/ProjectsLocationsRegistriesDevices.php b/vendor/google/apiclient-services/src/Google/Service/CloudIot/Resource/ProjectsLocationsRegistriesDevices.php index 800e23f..e2e3c25 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudIot/Resource/ProjectsLocationsRegistriesDevices.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudIot/Resource/ProjectsLocationsRegistriesDevices.php @@ -28,9 +28,9 @@ class Google_Service_CloudIot_Resource_ProjectsLocationsRegistriesDevices extend /** * Creates a device in a device registry. (devices.create) * - * @param string $parent The name of the device registry where this device - * should be created. For example, `projects/example-project/locations/us- - * central1/registries/my-registry`. + * @param string $parent Required. The name of the device registry where this + * device should be created. For example, `projects/example-project/locations + * /us-central1/registries/my-registry`. * @param Google_Service_CloudIot_Device $postBody * @param array $optParams Optional parameters. * @return Google_Service_CloudIot_Device @@ -44,7 +44,7 @@ class Google_Service_CloudIot_Resource_ProjectsLocationsRegistriesDevices extend /** * Deletes a device. (devices.delete) * - * @param string $name The name of the device. For example, + * @param string $name Required. The name of the device. For example, * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`. * @param array $optParams Optional parameters. @@ -59,7 +59,7 @@ class Google_Service_CloudIot_Resource_ProjectsLocationsRegistriesDevices extend /** * Gets details about a device. (devices.get) * - * @param string $name The name of the device. For example, + * @param string $name Required. The name of the device. For example, * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`. * @param array $optParams Optional parameters. @@ -79,17 +79,24 @@ class Google_Service_CloudIot_Resource_ProjectsLocationsRegistriesDevices extend * List devices in a device registry. * (devices.listProjectsLocationsRegistriesDevices) * - * @param string $parent The device registry path. Required. For example, - * `projects/my-project/locations/us-central1/registries/my-registry`. + * @param string $parent Required. The device registry path. Required. For + * example, `projects/my-project/locations/us-central1/registries/my-registry`. * @param array $optParams Optional parameters. * - * @opt_param string deviceNumIds A list of device numeric IDs. If empty, this - * field is ignored. Maximum IDs: 10,000. + * @opt_param int pageSize The maximum number of devices to return in the + * response. If this value is zero, the service will select a default size. A + * call may return fewer objects than requested. A non-empty `next_page_token` + * in the response indicates that more data is available. + * @opt_param string deviceIds A list of device string IDs. For example, + * `['device0', 'device12']`. If empty, this field is ignored. Maximum IDs: + * 10,000 * @opt_param string gatewayListOptions.associationsDeviceId If set, returns * only the gateways with which the specified device is associated. The device * ID can be numeric (`num_id`) or the user-defined string (`id`). For example, * if `456` is specified, returns only the gateways to which the device with * `num_id` 456 is bound. + * @opt_param string deviceNumIds A list of device numeric IDs. If empty, this + * field is ignored. Maximum IDs: 10,000. * @opt_param string gatewayListOptions.gatewayType If `GATEWAY` is specified, * only gateways are returned. If `NON_GATEWAY` is specified, only non-gateway * devices are returned. If `GATEWAY_TYPE_UNSPECIFIED` is specified, all devices @@ -99,19 +106,12 @@ class Google_Service_CloudIot_Resource_ProjectsLocationsRegistriesDevices extend * can be numeric (`num_id`) or the user-defined string (`id`). For example, if * `123` is specified, only devices bound to the gateway with `num_id` 123 are * returned. - * @opt_param string pageToken The value returned by the last - * `ListDevicesResponse`; indicates that this is a continuation of a prior - * `ListDevices` call and the system should return the next page of data. * @opt_param string fieldMask The fields of the `Device` resource to be * returned in the response. The fields `id` and `num_id` are always returned, * along with any other fields specified. - * @opt_param int pageSize The maximum number of devices to return in the - * response. If this value is zero, the service will select a default size. A - * call may return fewer objects than requested. A non-empty `next_page_token` - * in the response indicates that more data is available. - * @opt_param string deviceIds A list of device string IDs. For example, - * `['device0', 'device12']`. If empty, this field is ignored. Maximum IDs: - * 10,000 + * @opt_param string pageToken The value returned by the last + * `ListDevicesResponse`; indicates that this is a continuation of a prior + * `ListDevices` call and the system should return the next page of data. * @return Google_Service_CloudIot_ListDevicesResponse */ public function listProjectsLocationsRegistriesDevices($parent, $optParams = array()) @@ -125,7 +125,7 @@ class Google_Service_CloudIot_Resource_ProjectsLocationsRegistriesDevices extend * Cloud IoT Core servers. Returns the modified configuration version and its * metadata. (devices.modifyCloudToDeviceConfig) * - * @param string $name The name of the device. For example, + * @param string $name Required. The name of the device. For example, * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`. * @param Google_Service_CloudIot_ModifyCloudToDeviceConfigRequest $postBody @@ -149,10 +149,10 @@ class Google_Service_CloudIot_Resource_ProjectsLocationsRegistriesDevices extend * @param Google_Service_CloudIot_Device $postBody * @param array $optParams Optional parameters. * - * @opt_param string updateMask Only updates the `device` fields indicated by - * this mask. The field mask must not be empty, and it must not contain fields - * that are immutable or only set by the server. Mutable top-level fields: - * `credentials`, `blocked`, and `metadata` + * @opt_param string updateMask Required. Only updates the `device` fields + * indicated by this mask. The field mask must not be empty, and it must not + * contain fields that are immutable or only set by the server. Mutable top- + * level fields: `credentials`, `blocked`, and `metadata` * @return Google_Service_CloudIot_Device */ public function patch($name, Google_Service_CloudIot_Device $postBody, $optParams = array()) @@ -175,7 +175,7 @@ class Google_Service_CloudIot_Resource_ProjectsLocationsRegistriesDevices extend * once delivery will be guaranteed; for QoS 0, no acknowledgment will be * expected from the device. (devices.sendCommandToDevice) * - * @param string $name The name of the device. For example, + * @param string $name Required. The name of the device. For example, * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`. * @param Google_Service_CloudIot_SendCommandToDeviceRequest $postBody diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudIot/Resource/ProjectsLocationsRegistriesDevicesConfigVersions.php b/vendor/google/apiclient-services/src/Google/Service/CloudIot/Resource/ProjectsLocationsRegistriesDevicesConfigVersions.php index f8608c6..6483476 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudIot/Resource/ProjectsLocationsRegistriesDevicesConfigVersions.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudIot/Resource/ProjectsLocationsRegistriesDevicesConfigVersions.php @@ -30,7 +30,7 @@ class Google_Service_CloudIot_Resource_ProjectsLocationsRegistriesDevicesConfigV * (i.e.: newest first). * (configVersions.listProjectsLocationsRegistriesDevicesConfigVersions) * - * @param string $name The name of the device. For example, + * @param string $name Required. The name of the device. For example, * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`. * @param array $optParams Optional parameters. diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudIot/Resource/ProjectsLocationsRegistriesDevicesStates.php b/vendor/google/apiclient-services/src/Google/Service/CloudIot/Resource/ProjectsLocationsRegistriesDevicesStates.php index 5bf90de..582a746 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudIot/Resource/ProjectsLocationsRegistriesDevicesStates.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudIot/Resource/ProjectsLocationsRegistriesDevicesStates.php @@ -29,7 +29,7 @@ class Google_Service_CloudIot_Resource_ProjectsLocationsRegistriesDevicesStates * Lists the last few versions of the device state in descending order (i.e.: * newest first). (states.listProjectsLocationsRegistriesDevicesStates) * - * @param string $name The name of the device. For example, + * @param string $name Required. The name of the device. For example, * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`. * @param array $optParams Optional parameters. diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudIot/Resource/ProjectsLocationsRegistriesGroupsDevices.php b/vendor/google/apiclient-services/src/Google/Service/CloudIot/Resource/ProjectsLocationsRegistriesGroupsDevices.php index 50a97cd..752c4f3 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudIot/Resource/ProjectsLocationsRegistriesGroupsDevices.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudIot/Resource/ProjectsLocationsRegistriesGroupsDevices.php @@ -29,8 +29,8 @@ class Google_Service_CloudIot_Resource_ProjectsLocationsRegistriesGroupsDevices * List devices in a device registry. * (devices.listProjectsLocationsRegistriesGroupsDevices) * - * @param string $parent The device registry path. Required. For example, - * `projects/my-project/locations/us-central1/registries/my-registry`. + * @param string $parent Required. The device registry path. Required. For + * example, `projects/my-project/locations/us-central1/registries/my-registry`. * @param array $optParams Optional parameters. * * @opt_param string pageToken The value returned by the last diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudKMS.php b/vendor/google/apiclient-services/src/Google/Service/CloudKMS.php index 596d00f..cb72bda 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudKMS.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudKMS.php @@ -272,10 +272,6 @@ class Google_Service_CloudKMS extends Google_Service 'type' => 'string', 'required' => true, ), - 'versionView' => array( - 'location' => 'query', - 'type' => 'string', - ), 'filter' => array( 'location' => 'query', 'type' => 'string', @@ -292,6 +288,10 @@ class Google_Service_CloudKMS extends Google_Service 'location' => 'query', 'type' => 'string', ), + 'versionView' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'patch' => array( 'path' => 'v1/{+name}', @@ -426,14 +426,6 @@ class Google_Service_CloudKMS extends Google_Service 'type' => 'string', 'required' => true, ), - 'orderBy' => array( - 'location' => 'query', - 'type' => 'string', - ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -446,6 +438,14 @@ class Google_Service_CloudKMS extends Google_Service 'location' => 'query', 'type' => 'string', ), + 'orderBy' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'patch' => array( 'path' => 'v1/{+name}', @@ -528,14 +528,6 @@ class Google_Service_CloudKMS extends Google_Service 'type' => 'string', 'required' => true, ), - 'pageSize' => array( - 'location' => 'query', - 'type' => 'integer', - ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -544,6 +536,14 @@ class Google_Service_CloudKMS extends Google_Service 'location' => 'query', 'type' => 'string', ), + 'pageSize' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'setIamPolicy' => array( 'path' => 'v1/{+resource}:setIamPolicy', diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudKMS/AsymmetricSignResponse.php b/vendor/google/apiclient-services/src/Google/Service/CloudKMS/AsymmetricSignResponse.php index f66e597..92076a2 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudKMS/AsymmetricSignResponse.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudKMS/AsymmetricSignResponse.php @@ -17,17 +17,8 @@ class Google_Service_CloudKMS_AsymmetricSignResponse extends Google_Model { - public $name; public $signature; - public function setName($name) - { - $this->name = $name; - } - public function getName() - { - return $this->name; - } public function setSignature($signature) { $this->signature = $signature; diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudKMS/PublicKey.php b/vendor/google/apiclient-services/src/Google/Service/CloudKMS/PublicKey.php index b85984e..222fb9f 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudKMS/PublicKey.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudKMS/PublicKey.php @@ -18,7 +18,6 @@ class Google_Service_CloudKMS_PublicKey extends Google_Model { public $algorithm; - public $name; public $pem; public function setAlgorithm($algorithm) @@ -29,14 +28,6 @@ class Google_Service_CloudKMS_PublicKey extends Google_Model { return $this->algorithm; } - public function setName($name) - { - $this->name = $name; - } - public function getName() - { - return $this->name; - } public function setPem($pem) { $this->pem = $pem; diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudKMS/Resource/ProjectsLocationsKeyRings.php b/vendor/google/apiclient-services/src/Google/Service/CloudKMS/Resource/ProjectsLocationsKeyRings.php index 8bb4144..81893ea 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudKMS/Resource/ProjectsLocationsKeyRings.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudKMS/Resource/ProjectsLocationsKeyRings.php @@ -46,7 +46,7 @@ class Google_Service_CloudKMS_Resource_ProjectsLocationsKeyRings extends Google_ /** * Returns metadata for a given KeyRing. (keyRings.get) * - * @param string $name The name of the KeyRing to get. + * @param string $name Required. The name of the KeyRing to get. * @param array $optParams Optional parameters. * @return Google_Service_CloudKMS_KeyRing */ @@ -66,8 +66,14 @@ class Google_Service_CloudKMS_Resource_ProjectsLocationsKeyRings extends Google_ * @param array $optParams Optional parameters. * * @opt_param int options.requestedPolicyVersion Optional. The policy format - * version to be returned. Acceptable values are 0 and 1. If the value is 0, or - * the field is omitted, policy format version 1 will be returned. + * version to be returned. + * + * Valid values are 0, 1, and 3. Requests specifying an invalid value will be + * rejected. + * + * Requests for policies with any conditional bindings must specify version 3. + * Policies without any conditional bindings may specify any valid value or + * leave the field unset. * @return Google_Service_CloudKMS_Policy */ public function getIamPolicy($resource, $optParams = array()) @@ -86,16 +92,16 @@ class Google_Service_CloudKMS_Resource_ProjectsLocationsKeyRings extends Google_ * @opt_param string filter Optional. Only include resources that match the * filter in the response. For more information, see [Sorting and filtering list * results](https://cloud.google.com/kms/docs/sorting-and-filtering). - * @opt_param string pageToken Optional pagination token, returned earlier via - * ListKeyRingsResponse.next_page_token. + * @opt_param string pageToken Optional. Optional pagination token, returned + * earlier via ListKeyRingsResponse.next_page_token. * @opt_param string orderBy Optional. Specify how the results should be sorted. * If not specified, the results will be sorted in the default order. For more * information, see [Sorting and filtering list * results](https://cloud.google.com/kms/docs/sorting-and-filtering). - * @opt_param int pageSize Optional limit on the number of KeyRings to include - * in the response. Further KeyRings can subsequently be obtained by including - * the ListKeyRingsResponse.next_page_token in a subsequent request. If - * unspecified, the server will pick an appropriate default. + * @opt_param int pageSize Optional. Optional limit on the number of KeyRings to + * include in the response. Further KeyRings can subsequently be obtained by + * including the ListKeyRingsResponse.next_page_token in a subsequent request. + * If unspecified, the server will pick an appropriate default. * @return Google_Service_CloudKMS_ListKeyRingsResponse */ public function listProjectsLocationsKeyRings($parent, $optParams = array()) @@ -106,7 +112,10 @@ class Google_Service_CloudKMS_Resource_ProjectsLocationsKeyRings extends Google_ } /** * Sets the access control policy on the specified resource. Replaces any - * existing policy. (keyRings.setIamPolicy) + * existing policy. + * + * Can return Public Errors: NOT_FOUND, INVALID_ARGUMENT and PERMISSION_DENIED + * (keyRings.setIamPolicy) * * @param string $resource REQUIRED: The resource for which the policy is being * specified. See the operation documentation for the appropriate value for this diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudKMS/Resource/ProjectsLocationsKeyRingsCryptoKeys.php b/vendor/google/apiclient-services/src/Google/Service/CloudKMS/Resource/ProjectsLocationsKeyRingsCryptoKeys.php index 639e405..42f53ae 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudKMS/Resource/ProjectsLocationsKeyRingsCryptoKeys.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudKMS/Resource/ProjectsLocationsKeyRingsCryptoKeys.php @@ -88,7 +88,7 @@ class Google_Service_CloudKMS_Resource_ProjectsLocationsKeyRingsCryptoKeys exten * Returns metadata for a given CryptoKey, as well as its primary * CryptoKeyVersion. (cryptoKeys.get) * - * @param string $name The name of the CryptoKey to get. + * @param string $name Required. The name of the CryptoKey to get. * @param array $optParams Optional parameters. * @return Google_Service_CloudKMS_CryptoKey */ @@ -108,8 +108,14 @@ class Google_Service_CloudKMS_Resource_ProjectsLocationsKeyRingsCryptoKeys exten * @param array $optParams Optional parameters. * * @opt_param int options.requestedPolicyVersion Optional. The policy format - * version to be returned. Acceptable values are 0 and 1. If the value is 0, or - * the field is omitted, policy format version 1 will be returned. + * version to be returned. + * + * Valid values are 0, 1, and 3. Requests specifying an invalid value will be + * rejected. + * + * Requests for policies with any conditional bindings must specify version 3. + * Policies without any conditional bindings may specify any valid value or + * leave the field unset. * @return Google_Service_CloudKMS_Policy */ public function getIamPolicy($resource, $optParams = array()) @@ -125,21 +131,21 @@ class Google_Service_CloudKMS_Resource_ProjectsLocationsKeyRingsCryptoKeys exten * the format `projects/locations/keyRings`. * @param array $optParams Optional parameters. * - * @opt_param string versionView The fields of the primary version to include in - * the response. * @opt_param string filter Optional. Only include resources that match the * filter in the response. For more information, see [Sorting and filtering list * results](https://cloud.google.com/kms/docs/sorting-and-filtering). - * @opt_param string pageToken Optional pagination token, returned earlier via - * ListCryptoKeysResponse.next_page_token. - * @opt_param int pageSize Optional limit on the number of CryptoKeys to include - * in the response. Further CryptoKeys can subsequently be obtained by - * including the ListCryptoKeysResponse.next_page_token in a subsequent request. - * If unspecified, the server will pick an appropriate default. + * @opt_param string pageToken Optional. Optional pagination token, returned + * earlier via ListCryptoKeysResponse.next_page_token. + * @opt_param int pageSize Optional. Optional limit on the number of CryptoKeys + * to include in the response. Further CryptoKeys can subsequently be obtained + * by including the ListCryptoKeysResponse.next_page_token in a subsequent + * request. If unspecified, the server will pick an appropriate default. * @opt_param string orderBy Optional. Specify how the results should be sorted. * If not specified, the results will be sorted in the default order. For more * information, see [Sorting and filtering list * results](https://cloud.google.com/kms/docs/sorting-and-filtering). + * @opt_param string versionView The fields of the primary version to include in + * the response. * @return Google_Service_CloudKMS_ListCryptoKeysResponse */ public function listProjectsLocationsKeyRingsCryptoKeys($parent, $optParams = array()) @@ -156,7 +162,7 @@ class Google_Service_CloudKMS_Resource_ProjectsLocationsKeyRingsCryptoKeys exten * @param Google_Service_CloudKMS_CryptoKey $postBody * @param array $optParams Optional parameters. * - * @opt_param string updateMask Required list of fields to be updated in this + * @opt_param string updateMask Required. List of fields to be updated in this * request. * @return Google_Service_CloudKMS_CryptoKey */ @@ -168,7 +174,10 @@ class Google_Service_CloudKMS_Resource_ProjectsLocationsKeyRingsCryptoKeys exten } /** * Sets the access control policy on the specified resource. Replaces any - * existing policy. (cryptoKeys.setIamPolicy) + * existing policy. + * + * Can return Public Errors: NOT_FOUND, INVALID_ARGUMENT and PERMISSION_DENIED + * (cryptoKeys.setIamPolicy) * * @param string $resource REQUIRED: The resource for which the policy is being * specified. See the operation documentation for the appropriate value for this @@ -211,7 +220,7 @@ class Google_Service_CloudKMS_Resource_ProjectsLocationsKeyRingsCryptoKeys exten * Returns an error if called on an asymmetric key. * (cryptoKeys.updatePrimaryVersion) * - * @param string $name The resource name of the CryptoKey to update. + * @param string $name Required. The resource name of the CryptoKey to update. * @param Google_Service_CloudKMS_UpdateCryptoKeyPrimaryVersionRequest $postBody * @param array $optParams Optional parameters. * @return Google_Service_CloudKMS_CryptoKey diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudKMS/Resource/ProjectsLocationsKeyRingsCryptoKeysCryptoKeyVersions.php b/vendor/google/apiclient-services/src/Google/Service/CloudKMS/Resource/ProjectsLocationsKeyRingsCryptoKeysCryptoKeyVersions.php index d975bff..7a80b27 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudKMS/Resource/ProjectsLocationsKeyRingsCryptoKeysCryptoKeyVersions.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudKMS/Resource/ProjectsLocationsKeyRingsCryptoKeysCryptoKeyVersions.php @@ -88,7 +88,8 @@ class Google_Service_CloudKMS_Resource_ProjectsLocationsKeyRingsCryptoKeysCrypto * Before the destroy_time is reached, RestoreCryptoKeyVersion may be called to * reverse the process. (cryptoKeyVersions.destroy) * - * @param string $name The resource name of the CryptoKeyVersion to destroy. + * @param string $name Required. The resource name of the CryptoKeyVersion to + * destroy. * @param Google_Service_CloudKMS_DestroyCryptoKeyVersionRequest $postBody * @param array $optParams Optional parameters. * @return Google_Service_CloudKMS_CryptoKeyVersion @@ -102,7 +103,7 @@ class Google_Service_CloudKMS_Resource_ProjectsLocationsKeyRingsCryptoKeysCrypto /** * Returns metadata for a given CryptoKeyVersion. (cryptoKeyVersions.get) * - * @param string $name The name of the CryptoKeyVersion to get. + * @param string $name Required. The name of the CryptoKeyVersion to get. * @param array $optParams Optional parameters. * @return Google_Service_CloudKMS_CryptoKeyVersion */ @@ -117,7 +118,8 @@ class Google_Service_CloudKMS_Resource_ProjectsLocationsKeyRingsCryptoKeysCrypto * must be ASYMMETRIC_SIGN or ASYMMETRIC_DECRYPT. * (cryptoKeyVersions.getPublicKey) * - * @param string $name The name of the CryptoKeyVersion public key to get. + * @param string $name Required. The name of the CryptoKeyVersion public key to + * get. * @param array $optParams Optional parameters. * @return Google_Service_CloudKMS_PublicKey */ @@ -154,6 +156,14 @@ class Google_Service_CloudKMS_Resource_ProjectsLocationsKeyRingsCryptoKeysCrypto * in the format `projects/locations/keyRings/cryptoKeys`. * @param array $optParams Optional parameters. * + * @opt_param string pageToken Optional. Optional pagination token, returned + * earlier via ListCryptoKeyVersionsResponse.next_page_token. + * @opt_param int pageSize Optional. Optional limit on the number of + * CryptoKeyVersions to include in the response. Further CryptoKeyVersions can + * subsequently be obtained by including the + * ListCryptoKeyVersionsResponse.next_page_token in a subsequent request. If + * unspecified, the server will pick an appropriate default. + * @opt_param string view The fields to include in the response. * @opt_param string orderBy Optional. Specify how the results should be sorted. * If not specified, the results will be sorted in the default order. For more * information, see [Sorting and filtering list @@ -161,14 +171,6 @@ class Google_Service_CloudKMS_Resource_ProjectsLocationsKeyRingsCryptoKeysCrypto * @opt_param string filter Optional. Only include resources that match the * filter in the response. For more information, see [Sorting and filtering list * results](https://cloud.google.com/kms/docs/sorting-and-filtering). - * @opt_param string pageToken Optional pagination token, returned earlier via - * ListCryptoKeyVersionsResponse.next_page_token. - * @opt_param int pageSize Optional limit on the number of CryptoKeyVersions to - * include in the response. Further CryptoKeyVersions can subsequently be - * obtained by including the ListCryptoKeyVersionsResponse.next_page_token in a - * subsequent request. If unspecified, the server will pick an appropriate - * default. - * @opt_param string view The fields to include in the response. * @return Google_Service_CloudKMS_ListCryptoKeyVersionsResponse */ public function listProjectsLocationsKeyRingsCryptoKeysCryptoKeyVersions($parent, $optParams = array()) @@ -189,7 +191,7 @@ class Google_Service_CloudKMS_Resource_ProjectsLocationsKeyRingsCryptoKeysCrypto * @param Google_Service_CloudKMS_CryptoKeyVersion $postBody * @param array $optParams Optional parameters. * - * @opt_param string updateMask Required list of fields to be updated in this + * @opt_param string updateMask Required. List of fields to be updated in this * request. * @return Google_Service_CloudKMS_CryptoKeyVersion */ @@ -205,7 +207,8 @@ class Google_Service_CloudKMS_Resource_ProjectsLocationsKeyRingsCryptoKeysCrypto * Upon restoration of the CryptoKeyVersion, state will be set to DISABLED, and * destroy_time will be cleared. (cryptoKeyVersions.restore) * - * @param string $name The resource name of the CryptoKeyVersion to restore. + * @param string $name Required. The resource name of the CryptoKeyVersion to + * restore. * @param Google_Service_CloudKMS_RestoreCryptoKeyVersionRequest $postBody * @param array $optParams Optional parameters. * @return Google_Service_CloudKMS_CryptoKeyVersion diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudKMS/Resource/ProjectsLocationsKeyRingsImportJobs.php b/vendor/google/apiclient-services/src/Google/Service/CloudKMS/Resource/ProjectsLocationsKeyRingsImportJobs.php index 2695048..e19a4b9 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudKMS/Resource/ProjectsLocationsKeyRingsImportJobs.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudKMS/Resource/ProjectsLocationsKeyRingsImportJobs.php @@ -48,7 +48,7 @@ class Google_Service_CloudKMS_Resource_ProjectsLocationsKeyRingsImportJobs exten /** * Returns metadata for a given ImportJob. (importJobs.get) * - * @param string $name The name of the ImportJob to get. + * @param string $name Required. The name of the ImportJob to get. * @param array $optParams Optional parameters. * @return Google_Service_CloudKMS_ImportJob */ @@ -68,8 +68,14 @@ class Google_Service_CloudKMS_Resource_ProjectsLocationsKeyRingsImportJobs exten * @param array $optParams Optional parameters. * * @opt_param int options.requestedPolicyVersion Optional. The policy format - * version to be returned. Acceptable values are 0 and 1. If the value is 0, or - * the field is omitted, policy format version 1 will be returned. + * version to be returned. + * + * Valid values are 0, 1, and 3. Requests specifying an invalid value will be + * rejected. + * + * Requests for policies with any conditional bindings must specify version 3. + * Policies without any conditional bindings may specify any valid value or + * leave the field unset. * @return Google_Service_CloudKMS_Policy */ public function getIamPolicy($resource, $optParams = array()) @@ -85,19 +91,19 @@ class Google_Service_CloudKMS_Resource_ProjectsLocationsKeyRingsImportJobs exten * the format `projects/locations/keyRings`. * @param array $optParams Optional parameters. * - * @opt_param int pageSize Optional limit on the number of ImportJobs to include - * in the response. Further ImportJobs can subsequently be obtained by including - * the ListImportJobsResponse.next_page_token in a subsequent request. If - * unspecified, the server will pick an appropriate default. - * @opt_param string filter Optional. Only include resources that match the - * filter in the response. For more information, see [Sorting and filtering list - * results](https://cloud.google.com/kms/docs/sorting-and-filtering). - * @opt_param string pageToken Optional pagination token, returned earlier via - * ListImportJobsResponse.next_page_token. + * @opt_param string pageToken Optional. Optional pagination token, returned + * earlier via ListImportJobsResponse.next_page_token. * @opt_param string orderBy Optional. Specify how the results should be sorted. * If not specified, the results will be sorted in the default order. For more * information, see [Sorting and filtering list * results](https://cloud.google.com/kms/docs/sorting-and-filtering). + * @opt_param int pageSize Optional. Optional limit on the number of ImportJobs + * to include in the response. Further ImportJobs can subsequently be obtained + * by including the ListImportJobsResponse.next_page_token in a subsequent + * request. If unspecified, the server will pick an appropriate default. + * @opt_param string filter Optional. Only include resources that match the + * filter in the response. For more information, see [Sorting and filtering list + * results](https://cloud.google.com/kms/docs/sorting-and-filtering). * @return Google_Service_CloudKMS_ListImportJobsResponse */ public function listProjectsLocationsKeyRingsImportJobs($parent, $optParams = array()) @@ -108,7 +114,10 @@ class Google_Service_CloudKMS_Resource_ProjectsLocationsKeyRingsImportJobs exten } /** * Sets the access control policy on the specified resource. Replaces any - * existing policy. (importJobs.setIamPolicy) + * existing policy. + * + * Can return Public Errors: NOT_FOUND, INVALID_ARGUMENT and PERMISSION_DENIED + * (importJobs.setIamPolicy) * * @param string $resource REQUIRED: The resource for which the policy is being * specified. See the operation documentation for the appropriate value for this diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine.php b/vendor/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine.php index d36f114..d8d01e8 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine.php @@ -222,14 +222,14 @@ class Google_Service_CloudMachineLearningEngine extends Google_Service 'type' => 'string', 'required' => true, ), - 'pageSize' => array( - 'location' => 'query', - 'type' => 'integer', - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', ), + 'pageSize' => array( + 'location' => 'query', + 'type' => 'integer', + ), ), ), ) @@ -294,6 +294,10 @@ class Google_Service_CloudMachineLearningEngine extends Google_Service 'type' => 'string', 'required' => true, ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -302,10 +306,6 @@ class Google_Service_CloudMachineLearningEngine extends Google_Service 'location' => 'query', 'type' => 'integer', ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), ), ),'patch' => array( 'path' => 'v1/{+name}', @@ -390,6 +390,10 @@ class Google_Service_CloudMachineLearningEngine extends Google_Service 'type' => 'string', 'required' => true, ), + 'pageSize' => array( + 'location' => 'query', + 'type' => 'integer', + ), 'filter' => array( 'location' => 'query', 'type' => 'string', @@ -398,10 +402,6 @@ class Google_Service_CloudMachineLearningEngine extends Google_Service 'location' => 'query', 'type' => 'string', ), - 'pageSize' => array( - 'location' => 'query', - 'type' => 'integer', - ), ), ),'patch' => array( 'path' => 'v1/{+name}', @@ -466,6 +466,10 @@ class Google_Service_CloudMachineLearningEngine extends Google_Service 'type' => 'string', 'required' => true, ), + 'pageSize' => array( + 'location' => 'query', + 'type' => 'integer', + ), 'filter' => array( 'location' => 'query', 'type' => 'string', @@ -474,10 +478,6 @@ class Google_Service_CloudMachineLearningEngine extends Google_Service 'location' => 'query', 'type' => 'string', ), - 'pageSize' => array( - 'location' => 'query', - 'type' => 'integer', - ), ), ), ) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1TrainingInput.php b/vendor/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1TrainingInput.php index 2fd8f2a..c4b1106 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1TrainingInput.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1TrainingInput.php @@ -25,7 +25,6 @@ class Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1TrainingInput ext protected $masterConfigType = 'Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1ReplicaConfig'; protected $masterConfigDataType = ''; public $masterType; - public $maxRunningTime; public $packageUris; protected $parameterServerConfigType = 'Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1ReplicaConfig'; protected $parameterServerConfigDataType = ''; @@ -93,14 +92,6 @@ class Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1TrainingInput ext { return $this->masterType; } - public function setMaxRunningTime($maxRunningTime) - { - $this->maxRunningTime = $maxRunningTime; - } - public function getMaxRunningTime() - { - return $this->maxRunningTime; - } public function setPackageUris($packageUris) { $this->packageUris = $packageUris; diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1Version.php b/vendor/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1Version.php index c195456..d720ebe 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1Version.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1Version.php @@ -18,6 +18,8 @@ class Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1Version extends Google_Collection { protected $collection_key = 'packageUris'; + protected $acceleratorConfigType = 'Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1AcceleratorConfig'; + protected $acceleratorConfigDataType = ''; protected $autoScalingType = 'Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1AutoScaling'; protected $autoScalingDataType = ''; public $createTime; @@ -42,6 +44,20 @@ class Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1Version extends G public $serviceAccount; public $state; + /** + * @param Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1AcceleratorConfig + */ + public function setAcceleratorConfig(Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1AcceleratorConfig $acceleratorConfig) + { + $this->acceleratorConfig = $acceleratorConfig; + } + /** + * @return Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1AcceleratorConfig + */ + public function getAcceleratorConfig() + { + return $this->acceleratorConfig; + } /** * @param Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1AutoScaling */ diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsJobs.php b/vendor/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsJobs.php index 8534f7d..f459ad1 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsJobs.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsJobs.php @@ -76,8 +76,14 @@ class Google_Service_CloudMachineLearningEngine_Resource_ProjectsJobs extends Go * @param array $optParams Optional parameters. * * @opt_param int options.requestedPolicyVersion Optional. The policy format - * version to be returned. Acceptable values are 0, 1, and 3. If the value is 0, - * or the field is omitted, policy format version 1 will be returned. + * version to be returned. + * + * Valid values are 0, 1, and 3. Requests specifying an invalid value will be + * rejected. + * + * Requests for policies with any conditional bindings must specify version 3. + * Policies without any conditional bindings may specify any valid value or + * leave the field unset. * @return Google_Service_CloudMachineLearningEngine_GoogleIamV1Policy */ public function getIamPolicy($resource, $optParams = array()) @@ -153,7 +159,10 @@ class Google_Service_CloudMachineLearningEngine_Resource_ProjectsJobs extends Go } /** * Sets the access control policy on the specified resource. Replaces any - * existing policy. (jobs.setIamPolicy) + * existing policy. + * + * Can return Public Errors: NOT_FOUND, INVALID_ARGUMENT and PERMISSION_DENIED + * (jobs.setIamPolicy) * * @param string $resource REQUIRED: The resource for which the policy is being * specified. See the operation documentation for the appropriate value for this diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsLocations.php b/vendor/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsLocations.php index 67a9bd2..df3684d 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsLocations.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsLocations.php @@ -48,16 +48,16 @@ class Google_Service_CloudMachineLearningEngine_Resource_ProjectsLocations exten * specific projects). * @param array $optParams Optional parameters. * - * @opt_param int pageSize Optional. The number of locations to retrieve per - * "page" of results. If there are more remaining results than this number, the - * response message will contain a valid value in the `next_page_token` field. - * - * The default value is 20, and the maximum page size is 100. * @opt_param string pageToken Optional. A page token to request the next page * of results. * * You get the token from the `next_page_token` field of the response from the * previous call. + * @opt_param int pageSize Optional. The number of locations to retrieve per + * "page" of results. If there are more remaining results than this number, the + * response message will contain a valid value in the `next_page_token` field. + * + * The default value is 20, and the maximum page size is 100. * @return Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1ListLocationsResponse */ public function listProjectsLocations($parent, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsModels.php b/vendor/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsModels.php index 5a8cd5e..dced6a8 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsModels.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsModels.php @@ -85,8 +85,14 @@ class Google_Service_CloudMachineLearningEngine_Resource_ProjectsModels extends * @param array $optParams Optional parameters. * * @opt_param int options.requestedPolicyVersion Optional. The policy format - * version to be returned. Acceptable values are 0, 1, and 3. If the value is 0, - * or the field is omitted, policy format version 1 will be returned. + * version to be returned. + * + * Valid values are 0, 1, and 3. Requests specifying an invalid value will be + * rejected. + * + * Requests for policies with any conditional bindings must specify version 3. + * Policies without any conditional bindings may specify any valid value or + * leave the field unset. * @return Google_Service_CloudMachineLearningEngine_GoogleIamV1Policy */ public function getIamPolicy($resource, $optParams = array()) @@ -108,6 +114,8 @@ class Google_Service_CloudMachineLearningEngine_Resource_ProjectsModels extends * be listed. * @param array $optParams Optional parameters. * + * @opt_param string filter Optional. Specifies the subset of models to + * retrieve. * @opt_param string pageToken Optional. A page token to request the next page * of results. * @@ -118,8 +126,6 @@ class Google_Service_CloudMachineLearningEngine_Resource_ProjectsModels extends * response message will contain a valid value in the `next_page_token` field. * * The default value is 20, and the maximum page size is 100. - * @opt_param string filter Optional. Specifies the subset of models to - * retrieve. * @return Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1ListModelsResponse */ public function listProjectsModels($parent, $optParams = array()) @@ -159,7 +165,10 @@ class Google_Service_CloudMachineLearningEngine_Resource_ProjectsModels extends } /** * Sets the access control policy on the specified resource. Replaces any - * existing policy. (models.setIamPolicy) + * existing policy. + * + * Can return Public Errors: NOT_FOUND, INVALID_ARGUMENT and PERMISSION_DENIED + * (models.setIamPolicy) * * @param string $resource REQUIRED: The resource for which the policy is being * specified. See the operation documentation for the appropriate value for this diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsModelsVersions.php b/vendor/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsModelsVersions.php index 70451dc..0e74137 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsModelsVersions.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsModelsVersions.php @@ -102,6 +102,11 @@ class Google_Service_CloudMachineLearningEngine_Resource_ProjectsModelsVersions * version. * @param array $optParams Optional parameters. * + * @opt_param int pageSize Optional. The number of versions to retrieve per + * "page" of results. If there are more remaining results than this number, the + * response message will contain a valid value in the `next_page_token` field. + * + * The default value is 20, and the maximum page size is 100. * @opt_param string filter Optional. Specifies the subset of versions to * retrieve. * @opt_param string pageToken Optional. A page token to request the next page @@ -109,11 +114,6 @@ class Google_Service_CloudMachineLearningEngine_Resource_ProjectsModelsVersions * * You get the token from the `next_page_token` field of the response from the * previous call. - * @opt_param int pageSize Optional. The number of versions to retrieve per - * "page" of results. If there are more remaining results than this number, the - * response message will contain a valid value in the `next_page_token` field. - * - * The default value is 20, and the maximum page size is 100. * @return Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1ListVersionsResponse */ public function listProjectsModelsVersions($parent, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsOperations.php b/vendor/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsOperations.php index 8fcca2e..7afd5c8 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsOperations.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsOperations.php @@ -76,9 +76,9 @@ class Google_Service_CloudMachineLearningEngine_Resource_ProjectsOperations exte * @param string $name The name of the operation's parent resource. * @param array $optParams Optional parameters. * + * @opt_param int pageSize The standard list page size. * @opt_param string filter The standard list filter. * @opt_param string pageToken The standard list page token. - * @opt_param int pageSize The standard list page size. * @return Google_Service_CloudMachineLearningEngine_GoogleLongrunningListOperationsResponse */ public function listProjectsOperations($name, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudOSLogin/PosixAccount.php b/vendor/google/apiclient-services/src/Google/Service/CloudOSLogin/PosixAccount.php index 2bb9b38..2d2796b 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudOSLogin/PosixAccount.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudOSLogin/PosixAccount.php @@ -21,6 +21,7 @@ class Google_Service_CloudOSLogin_PosixAccount extends Google_Model public $gecos; public $gid; public $homeDirectory; + public $name; public $operatingSystemType; public $primary; public $shell; @@ -60,6 +61,14 @@ class Google_Service_CloudOSLogin_PosixAccount extends Google_Model { return $this->homeDirectory; } + public function setName($name) + { + $this->name = $name; + } + public function getName() + { + return $this->name; + } public function setOperatingSystemType($operatingSystemType) { $this->operatingSystemType = $operatingSystemType; diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudOSLogin/SshPublicKey.php b/vendor/google/apiclient-services/src/Google/Service/CloudOSLogin/SshPublicKey.php index 22801f0..bb264bb 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudOSLogin/SshPublicKey.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudOSLogin/SshPublicKey.php @@ -20,6 +20,7 @@ class Google_Service_CloudOSLogin_SshPublicKey extends Google_Model public $expirationTimeUsec; public $fingerprint; public $key; + public $name; public function setExpirationTimeUsec($expirationTimeUsec) { @@ -45,4 +46,12 @@ class Google_Service_CloudOSLogin_SshPublicKey extends Google_Model { return $this->key; } + public function setName($name) + { + $this->name = $name; + } + public function getName() + { + return $this->name; + } } diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudPrivateCatalogProducer.php b/vendor/google/apiclient-services/src/Google/Service/CloudPrivateCatalogProducer.php index ac39cf7..308ed28 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudPrivateCatalogProducer.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudPrivateCatalogProducer.php @@ -284,10 +284,6 @@ class Google_Service_CloudPrivateCatalogProducer extends Google_Service 'type' => 'string', 'required' => true, ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -296,6 +292,10 @@ class Google_Service_CloudPrivateCatalogProducer extends Google_Service 'location' => 'query', 'type' => 'integer', ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'patch' => array( 'path' => 'v1beta1/{+name}', @@ -447,10 +447,6 @@ class Google_Service_CloudPrivateCatalogProducer extends Google_Service 'path' => 'v1beta1/operations', 'httpMethod' => 'GET', 'parameters' => array( - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), 'name' => array( 'location' => 'query', 'type' => 'string', @@ -463,6 +459,10 @@ class Google_Service_CloudPrivateCatalogProducer extends Google_Service 'location' => 'query', 'type' => 'integer', ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ), ) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudPrivateCatalogProducer/Resource/Catalogs.php b/vendor/google/apiclient-services/src/Google/Service/CloudPrivateCatalogProducer/Resource/Catalogs.php index 6432319..4d9adb4 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudPrivateCatalogProducer/Resource/Catalogs.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudPrivateCatalogProducer/Resource/Catalogs.php @@ -80,8 +80,14 @@ class Google_Service_CloudPrivateCatalogProducer_Resource_Catalogs extends Googl * @param array $optParams Optional parameters. * * @opt_param int options.requestedPolicyVersion Optional. The policy format - * version to be returned. Acceptable values are 0, 1, and 3. If the value is 0, - * or the field is omitted, policy format version 1 will be returned. + * version to be returned. + * + * Valid values are 0, 1, and 3. Requests specifying an invalid value will be + * rejected. + * + * Requests for policies with any conditional bindings must specify version 3. + * Policies without any conditional bindings may specify any valid value or + * leave the field unset. * @return Google_Service_CloudPrivateCatalogProducer_GoogleIamV1Policy */ public function getIamPolicy($resource, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudPrivateCatalogProducer/Resource/CatalogsProducts.php b/vendor/google/apiclient-services/src/Google/Service/CloudPrivateCatalogProducer/Resource/CatalogsProducts.php index 8f83614..f3768fe 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudPrivateCatalogProducer/Resource/CatalogsProducts.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudPrivateCatalogProducer/Resource/CatalogsProducts.php @@ -87,12 +87,12 @@ class Google_Service_CloudPrivateCatalogProducer_Resource_CatalogsProducts exten * @param string $parent The resource name of the parent resource. * @param array $optParams Optional parameters. * - * @opt_param string filter A filter expression used to restrict the returned - * results based upon properties of the product. * @opt_param string pageToken A pagination token returned from a previous call * to ListProducts that indicates where this listing should continue from. This * field is optional. * @opt_param int pageSize The maximum number of products to return. + * @opt_param string filter A filter expression used to restrict the returned + * results based upon properties of the product. * @return Google_Service_CloudPrivateCatalogProducer_GoogleCloudPrivatecatalogproducerV1beta1ListProductsResponse */ public function listCatalogsProducts($parent, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudPrivateCatalogProducer/Resource/Operations.php b/vendor/google/apiclient-services/src/Google/Service/CloudPrivateCatalogProducer/Resource/Operations.php index 7c415ad..cf7605f 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudPrivateCatalogProducer/Resource/Operations.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudPrivateCatalogProducer/Resource/Operations.php @@ -92,10 +92,10 @@ class Google_Service_CloudPrivateCatalogProducer_Resource_Operations extends Goo * * @param array $optParams Optional parameters. * - * @opt_param string filter The standard list filter. * @opt_param string name The name of the operation's parent resource. * @opt_param string pageToken The standard list page token. * @opt_param int pageSize The standard list page size. + * @opt_param string filter The standard list filter. * @return Google_Service_CloudPrivateCatalogProducer_GoogleLongrunningListOperationsResponse */ public function listOperations($optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudResourceManager.php b/vendor/google/apiclient-services/src/Google/Service/CloudResourceManager.php index 56165d8..769250b 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudResourceManager.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudResourceManager.php @@ -105,14 +105,6 @@ class Google_Service_CloudResourceManager extends Google_Service 'path' => 'v2/folders', 'httpMethod' => 'GET', 'parameters' => array( - 'parent' => array( - 'location' => 'query', - 'type' => 'string', - ), - 'showDeleted' => array( - 'location' => 'query', - 'type' => 'boolean', - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -121,6 +113,14 @@ class Google_Service_CloudResourceManager extends Google_Service 'location' => 'query', 'type' => 'integer', ), + 'parent' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'showDeleted' => array( + 'location' => 'query', + 'type' => 'boolean', + ), ), ),'move' => array( 'path' => 'v2/{+name}:move', diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudResourceManager/Resource/Folders.php b/vendor/google/apiclient-services/src/Google/Service/CloudResourceManager/Resource/Folders.php index a9a66e3..0c0a19c 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudResourceManager/Resource/Folders.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudResourceManager/Resource/Folders.php @@ -129,17 +129,17 @@ class Google_Service_CloudResourceManager_Resource_Folders extends Google_Servic * * @param array $optParams Optional parameters. * + * @opt_param string pageToken A pagination token returned from a previous call + * to `ListFolders` that indicates where this listing should continue from. This + * field is optional. + * @opt_param int pageSize The maximum number of Folders to return in the + * response. This field is optional. * @opt_param string parent The resource name of the Organization or Folder * whose Folders are being listed. Must be of the form `folders/{folder_id}` or * `organizations/{org_id}`. Access to this method is controlled by checking the * `resourcemanager.folders.list` permission on the `parent`. * @opt_param bool showDeleted Controls whether Folders in the DELETE_REQUESTED * state should be returned. Defaults to false. This field is optional. - * @opt_param string pageToken A pagination token returned from a previous call - * to `ListFolders` that indicates where this listing should continue from. This - * field is optional. - * @opt_param int pageSize The maximum number of Folders to return in the - * response. This field is optional. * @return Google_Service_CloudResourceManager_ListFoldersResponse */ public function listFolders($optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun.php index 4bcb2fc..55f6b87 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudRun.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun.php @@ -35,7 +35,21 @@ class Google_Service_CloudRun extends Google_Service const CLOUD_PLATFORM = "https://www.googleapis.com/auth/cloud-platform"; + public $namespaces_authorizeddomains; + public $namespaces_autodomainmappings; + public $namespaces_configurations; + public $namespaces_domainmappings; + public $namespaces_revisions; + public $namespaces_routes; + public $namespaces_services; public $projects_locations; + public $projects_locations_authorizeddomains; + public $projects_locations_autodomainmappings; + public $projects_locations_configurations; + public $projects_locations_domainmappings; + public $projects_locations_revisions; + public $projects_locations_routes; + public $projects_locations_services; /** * Constructs the internal representation of the CloudRun service. @@ -52,6 +66,614 @@ class Google_Service_CloudRun extends Google_Service $this->version = 'v1'; $this->serviceName = 'run'; + $this->namespaces_authorizeddomains = new Google_Service_CloudRun_Resource_NamespacesAuthorizeddomains( + $this, + $this->serviceName, + 'authorizeddomains', + array( + 'methods' => array( + 'list' => array( + 'path' => 'apis/domains.cloudrun.com/v1/{+parent}/authorizeddomains', + 'httpMethod' => 'GET', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'pageSize' => array( + 'location' => 'query', + 'type' => 'integer', + ), + ), + ), + ) + ) + ); + $this->namespaces_autodomainmappings = new Google_Service_CloudRun_Resource_NamespacesAutodomainmappings( + $this, + $this->serviceName, + 'autodomainmappings', + array( + 'methods' => array( + 'create' => array( + 'path' => 'apis/domains.cloudrun.com/v1/{+parent}/autodomainmappings', + 'httpMethod' => 'POST', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'delete' => array( + 'path' => 'apis/domains.cloudrun.com/v1/{+name}', + 'httpMethod' => 'DELETE', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'apiVersion' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'propagationPolicy' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'kind' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'get' => array( + 'path' => 'apis/domains.cloudrun.com/v1/{+name}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'list' => array( + 'path' => 'apis/domains.cloudrun.com/v1/{+parent}/autodomainmappings', + 'httpMethod' => 'GET', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'labelSelector' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'fieldSelector' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'includeUninitialized' => array( + 'location' => 'query', + 'type' => 'boolean', + ), + 'resourceVersion' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'continue' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'limit' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'watch' => array( + 'location' => 'query', + 'type' => 'boolean', + ), + ), + ),'replaceAutoDomainMapping' => array( + 'path' => 'apis/domains.cloudrun.com/v1/{+name}', + 'httpMethod' => 'PUT', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ), + ) + ) + ); + $this->namespaces_configurations = new Google_Service_CloudRun_Resource_NamespacesConfigurations( + $this, + $this->serviceName, + 'configurations', + array( + 'methods' => array( + 'create' => array( + 'path' => 'apis/serving.knative.dev/v1/{+parent}/configurations', + 'httpMethod' => 'POST', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'delete' => array( + 'path' => 'apis/serving.knative.dev/v1/{+name}', + 'httpMethod' => 'DELETE', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'apiVersion' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'propagationPolicy' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'kind' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'get' => array( + 'path' => 'apis/serving.knative.dev/v1/{+name}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'list' => array( + 'path' => 'apis/serving.knative.dev/v1/{+parent}/configurations', + 'httpMethod' => 'GET', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'labelSelector' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'resourceVersion' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'includeUninitialized' => array( + 'location' => 'query', + 'type' => 'boolean', + ), + 'fieldSelector' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'continue' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'limit' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'watch' => array( + 'location' => 'query', + 'type' => 'boolean', + ), + ), + ),'replaceConfiguration' => array( + 'path' => 'apis/serving.knative.dev/v1/{+name}', + 'httpMethod' => 'PUT', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ), + ) + ) + ); + $this->namespaces_domainmappings = new Google_Service_CloudRun_Resource_NamespacesDomainmappings( + $this, + $this->serviceName, + 'domainmappings', + array( + 'methods' => array( + 'create' => array( + 'path' => 'apis/domains.cloudrun.com/v1/{+parent}/domainmappings', + 'httpMethod' => 'POST', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'delete' => array( + 'path' => 'apis/domains.cloudrun.com/v1/{+name}', + 'httpMethod' => 'DELETE', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'apiVersion' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'propagationPolicy' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'kind' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'get' => array( + 'path' => 'apis/domains.cloudrun.com/v1/{+name}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'list' => array( + 'path' => 'apis/domains.cloudrun.com/v1/{+parent}/domainmappings', + 'httpMethod' => 'GET', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'labelSelector' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'resourceVersion' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'includeUninitialized' => array( + 'location' => 'query', + 'type' => 'boolean', + ), + 'fieldSelector' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'continue' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'limit' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'watch' => array( + 'location' => 'query', + 'type' => 'boolean', + ), + ), + ),'replaceDomainMapping' => array( + 'path' => 'apis/domains.cloudrun.com/v1/{+name}', + 'httpMethod' => 'PUT', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ), + ) + ) + ); + $this->namespaces_revisions = new Google_Service_CloudRun_Resource_NamespacesRevisions( + $this, + $this->serviceName, + 'revisions', + array( + 'methods' => array( + 'delete' => array( + 'path' => 'apis/serving.knative.dev/v1/{+name}', + 'httpMethod' => 'DELETE', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'apiVersion' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'propagationPolicy' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'kind' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'get' => array( + 'path' => 'apis/serving.knative.dev/v1/{+name}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'list' => array( + 'path' => 'apis/serving.knative.dev/v1/{+parent}/revisions', + 'httpMethod' => 'GET', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'labelSelector' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'resourceVersion' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'includeUninitialized' => array( + 'location' => 'query', + 'type' => 'boolean', + ), + 'fieldSelector' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'continue' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'limit' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'watch' => array( + 'location' => 'query', + 'type' => 'boolean', + ), + ), + ), + ) + ) + ); + $this->namespaces_routes = new Google_Service_CloudRun_Resource_NamespacesRoutes( + $this, + $this->serviceName, + 'routes', + array( + 'methods' => array( + 'create' => array( + 'path' => 'apis/serving.knative.dev/v1/{+parent}/routes', + 'httpMethod' => 'POST', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'delete' => array( + 'path' => 'apis/serving.knative.dev/v1/{+name}', + 'httpMethod' => 'DELETE', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'apiVersion' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'propagationPolicy' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'kind' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'get' => array( + 'path' => 'apis/serving.knative.dev/v1/{+name}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'list' => array( + 'path' => 'apis/serving.knative.dev/v1/{+parent}/routes', + 'httpMethod' => 'GET', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'limit' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'watch' => array( + 'location' => 'query', + 'type' => 'boolean', + ), + 'labelSelector' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'fieldSelector' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'resourceVersion' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'includeUninitialized' => array( + 'location' => 'query', + 'type' => 'boolean', + ), + 'continue' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'replaceRoute' => array( + 'path' => 'apis/serving.knative.dev/v1/{+name}', + 'httpMethod' => 'PUT', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ), + ) + ) + ); + $this->namespaces_services = new Google_Service_CloudRun_Resource_NamespacesServices( + $this, + $this->serviceName, + 'services', + array( + 'methods' => array( + 'create' => array( + 'path' => 'apis/serving.knative.dev/v1/{+parent}/services', + 'httpMethod' => 'POST', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'delete' => array( + 'path' => 'apis/serving.knative.dev/v1/{+name}', + 'httpMethod' => 'DELETE', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'propagationPolicy' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'kind' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'apiVersion' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'get' => array( + 'path' => 'apis/serving.knative.dev/v1/{+name}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'list' => array( + 'path' => 'apis/serving.knative.dev/v1/{+parent}/services', + 'httpMethod' => 'GET', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'labelSelector' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'resourceVersion' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'includeUninitialized' => array( + 'location' => 'query', + 'type' => 'boolean', + ), + 'fieldSelector' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'continue' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'limit' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'watch' => array( + 'location' => 'query', + 'type' => 'boolean', + ), + ), + ),'replaceService' => array( + 'path' => 'apis/serving.knative.dev/v1/{+name}', + 'httpMethod' => 'PUT', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ), + ) + ) + ); $this->projects_locations = new Google_Service_CloudRun_Resource_ProjectsLocations( $this, $this->serviceName, @@ -77,10 +699,38 @@ class Google_Service_CloudRun extends Google_Service 'type' => 'string', 'required' => true, ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'pageSize' => array( + 'location' => 'query', + 'type' => 'integer', + ), 'filter' => array( 'location' => 'query', 'type' => 'string', ), + ), + ), + ) + ) + ); + $this->projects_locations_authorizeddomains = new Google_Service_CloudRun_Resource_ProjectsLocationsAuthorizeddomains( + $this, + $this->serviceName, + 'authorizeddomains', + array( + 'methods' => array( + 'list' => array( + 'path' => 'v1/{+parent}/authorizeddomains', + 'httpMethod' => 'GET', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -94,5 +744,619 @@ class Google_Service_CloudRun extends Google_Service ) ) ); + $this->projects_locations_autodomainmappings = new Google_Service_CloudRun_Resource_ProjectsLocationsAutodomainmappings( + $this, + $this->serviceName, + 'autodomainmappings', + array( + 'methods' => array( + 'create' => array( + 'path' => 'v1/{+parent}/autodomainmappings', + 'httpMethod' => 'POST', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'delete' => array( + 'path' => 'v1/{+name}', + 'httpMethod' => 'DELETE', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'propagationPolicy' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'kind' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'apiVersion' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'get' => array( + 'path' => 'v1/{+name}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'list' => array( + 'path' => 'v1/{+parent}/autodomainmappings', + 'httpMethod' => 'GET', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'fieldSelector' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'resourceVersion' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'includeUninitialized' => array( + 'location' => 'query', + 'type' => 'boolean', + ), + 'continue' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'limit' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'watch' => array( + 'location' => 'query', + 'type' => 'boolean', + ), + 'labelSelector' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'replaceAutoDomainMapping' => array( + 'path' => 'v1/{+name}', + 'httpMethod' => 'PUT', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ), + ) + ) + ); + $this->projects_locations_configurations = new Google_Service_CloudRun_Resource_ProjectsLocationsConfigurations( + $this, + $this->serviceName, + 'configurations', + array( + 'methods' => array( + 'create' => array( + 'path' => 'v1/{+parent}/configurations', + 'httpMethod' => 'POST', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'delete' => array( + 'path' => 'v1/{+name}', + 'httpMethod' => 'DELETE', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'apiVersion' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'propagationPolicy' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'kind' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'get' => array( + 'path' => 'v1/{+name}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'list' => array( + 'path' => 'v1/{+parent}/configurations', + 'httpMethod' => 'GET', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'labelSelector' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'resourceVersion' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'includeUninitialized' => array( + 'location' => 'query', + 'type' => 'boolean', + ), + 'fieldSelector' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'continue' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'limit' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'watch' => array( + 'location' => 'query', + 'type' => 'boolean', + ), + ), + ),'replaceConfiguration' => array( + 'path' => 'v1/{+name}', + 'httpMethod' => 'PUT', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ), + ) + ) + ); + $this->projects_locations_domainmappings = new Google_Service_CloudRun_Resource_ProjectsLocationsDomainmappings( + $this, + $this->serviceName, + 'domainmappings', + array( + 'methods' => array( + 'create' => array( + 'path' => 'v1/{+parent}/domainmappings', + 'httpMethod' => 'POST', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'delete' => array( + 'path' => 'v1/{+name}', + 'httpMethod' => 'DELETE', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'apiVersion' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'propagationPolicy' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'kind' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'get' => array( + 'path' => 'v1/{+name}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'list' => array( + 'path' => 'v1/{+parent}/domainmappings', + 'httpMethod' => 'GET', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'labelSelector' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'fieldSelector' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'includeUninitialized' => array( + 'location' => 'query', + 'type' => 'boolean', + ), + 'resourceVersion' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'continue' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'limit' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'watch' => array( + 'location' => 'query', + 'type' => 'boolean', + ), + ), + ),'replaceDomainMapping' => array( + 'path' => 'v1/{+name}', + 'httpMethod' => 'PUT', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ), + ) + ) + ); + $this->projects_locations_revisions = new Google_Service_CloudRun_Resource_ProjectsLocationsRevisions( + $this, + $this->serviceName, + 'revisions', + array( + 'methods' => array( + 'delete' => array( + 'path' => 'v1/{+name}', + 'httpMethod' => 'DELETE', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'apiVersion' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'propagationPolicy' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'kind' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'get' => array( + 'path' => 'v1/{+name}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'list' => array( + 'path' => 'v1/{+parent}/revisions', + 'httpMethod' => 'GET', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'watch' => array( + 'location' => 'query', + 'type' => 'boolean', + ), + 'labelSelector' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'resourceVersion' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'includeUninitialized' => array( + 'location' => 'query', + 'type' => 'boolean', + ), + 'fieldSelector' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'continue' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'limit' => array( + 'location' => 'query', + 'type' => 'integer', + ), + ), + ), + ) + ) + ); + $this->projects_locations_routes = new Google_Service_CloudRun_Resource_ProjectsLocationsRoutes( + $this, + $this->serviceName, + 'routes', + array( + 'methods' => array( + 'create' => array( + 'path' => 'v1/{+parent}/routes', + 'httpMethod' => 'POST', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'delete' => array( + 'path' => 'v1/{+name}', + 'httpMethod' => 'DELETE', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'apiVersion' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'propagationPolicy' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'kind' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'get' => array( + 'path' => 'v1/{+name}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'list' => array( + 'path' => 'v1/{+parent}/routes', + 'httpMethod' => 'GET', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'continue' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'limit' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'watch' => array( + 'location' => 'query', + 'type' => 'boolean', + ), + 'labelSelector' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'resourceVersion' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'includeUninitialized' => array( + 'location' => 'query', + 'type' => 'boolean', + ), + 'fieldSelector' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'replaceRoute' => array( + 'path' => 'v1/{+name}', + 'httpMethod' => 'PUT', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ), + ) + ) + ); + $this->projects_locations_services = new Google_Service_CloudRun_Resource_ProjectsLocationsServices( + $this, + $this->serviceName, + 'services', + array( + 'methods' => array( + 'create' => array( + 'path' => 'v1/{+parent}/services', + 'httpMethod' => 'POST', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'delete' => array( + 'path' => 'v1/{+name}', + 'httpMethod' => 'DELETE', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'apiVersion' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'propagationPolicy' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'kind' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'get' => array( + 'path' => 'v1/{+name}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'getIamPolicy' => array( + 'path' => 'v1/{+resource}:getIamPolicy', + 'httpMethod' => 'GET', + 'parameters' => array( + 'resource' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'options.requestedPolicyVersion' => array( + 'location' => 'query', + 'type' => 'integer', + ), + ), + ),'list' => array( + 'path' => 'v1/{+parent}/services', + 'httpMethod' => 'GET', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'labelSelector' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'resourceVersion' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'includeUninitialized' => array( + 'location' => 'query', + 'type' => 'boolean', + ), + 'fieldSelector' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'continue' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'limit' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'watch' => array( + 'location' => 'query', + 'type' => 'boolean', + ), + ), + ),'replaceService' => array( + 'path' => 'v1/{+name}', + 'httpMethod' => 'PUT', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'setIamPolicy' => array( + 'path' => 'v1/{+resource}:setIamPolicy', + 'httpMethod' => 'POST', + 'parameters' => array( + 'resource' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'testIamPermissions' => array( + 'path' => 'v1/{+resource}:testIamPermissions', + 'httpMethod' => 'POST', + 'parameters' => array( + 'resource' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ), + ) + ) + ); } } diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1GcsSource.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Addressable.php similarity index 75% rename from vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1GcsSource.php rename to vendor/google/apiclient-services/src/Google/Service/CloudRun/Addressable.php index 80027f6..4030095 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1GcsSource.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Addressable.php @@ -15,16 +15,16 @@ * the License. */ -class Google_Service_Vision_GoogleCloudVisionV1p5beta1GcsSource extends Google_Model +class Google_Service_CloudRun_Addressable extends Google_Model { - public $uri; + public $url; - public function setUri($uri) + public function setUrl($url) { - $this->uri = $uri; + $this->url = $url; } - public function getUri() + public function getUrl() { - return $this->uri; + return $this->url; } } diff --git a/vendor/google/apiclient-services/src/Google/Service/ContainerAnalysis/AuditConfig.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/AuditConfig.php similarity index 79% rename from vendor/google/apiclient-services/src/Google/Service/ContainerAnalysis/AuditConfig.php rename to vendor/google/apiclient-services/src/Google/Service/CloudRun/AuditConfig.php index b5c01f5..1a5794a 100644 --- a/vendor/google/apiclient-services/src/Google/Service/ContainerAnalysis/AuditConfig.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/AuditConfig.php @@ -15,22 +15,22 @@ * the License. */ -class Google_Service_ContainerAnalysis_AuditConfig extends Google_Collection +class Google_Service_CloudRun_AuditConfig extends Google_Collection { protected $collection_key = 'auditLogConfigs'; - protected $auditLogConfigsType = 'Google_Service_ContainerAnalysis_AuditLogConfig'; + protected $auditLogConfigsType = 'Google_Service_CloudRun_AuditLogConfig'; protected $auditLogConfigsDataType = 'array'; public $service; /** - * @param Google_Service_ContainerAnalysis_AuditLogConfig + * @param Google_Service_CloudRun_AuditLogConfig */ public function setAuditLogConfigs($auditLogConfigs) { $this->auditLogConfigs = $auditLogConfigs; } /** - * @return Google_Service_ContainerAnalysis_AuditLogConfig + * @return Google_Service_CloudRun_AuditLogConfig */ public function getAuditLogConfigs() { diff --git a/vendor/google/apiclient-services/src/Google/Service/ContainerAnalysis/AuditLogConfig.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/AuditLogConfig.php similarity index 92% rename from vendor/google/apiclient-services/src/Google/Service/ContainerAnalysis/AuditLogConfig.php rename to vendor/google/apiclient-services/src/Google/Service/CloudRun/AuditLogConfig.php index 43680b0..216f418 100644 --- a/vendor/google/apiclient-services/src/Google/Service/ContainerAnalysis/AuditLogConfig.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/AuditLogConfig.php @@ -15,7 +15,7 @@ * the License. */ -class Google_Service_ContainerAnalysis_AuditLogConfig extends Google_Collection +class Google_Service_CloudRun_AuditLogConfig extends Google_Collection { protected $collection_key = 'exemptedMembers'; public $exemptedMembers; diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/AnnotationStore.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/AuthorizedDomain.php similarity index 78% rename from vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/AnnotationStore.php rename to vendor/google/apiclient-services/src/Google/Service/CloudRun/AuthorizedDomain.php index 9525ef5..12537b2 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/AnnotationStore.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/AuthorizedDomain.php @@ -15,18 +15,18 @@ * the License. */ -class Google_Service_CloudHealthcare_AnnotationStore extends Google_Model +class Google_Service_CloudRun_AuthorizedDomain extends Google_Model { - public $labels; + public $id; public $name; - public function setLabels($labels) + public function setId($id) { - $this->labels = $labels; + $this->id = $id; } - public function getLabels() + public function getId() { - return $this->labels; + return $this->id; } public function setName($name) { diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/AutoDomainMapping.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/AutoDomainMapping.php new file mode 100644 index 0000000..52218de --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/AutoDomainMapping.php @@ -0,0 +1,87 @@ +apiVersion = $apiVersion; + } + public function getApiVersion() + { + return $this->apiVersion; + } + public function setKind($kind) + { + $this->kind = $kind; + } + public function getKind() + { + return $this->kind; + } + /** + * @param Google_Service_CloudRun_ObjectMeta + */ + public function setMetadata(Google_Service_CloudRun_ObjectMeta $metadata) + { + $this->metadata = $metadata; + } + /** + * @return Google_Service_CloudRun_ObjectMeta + */ + public function getMetadata() + { + return $this->metadata; + } + /** + * @param Google_Service_CloudRun_AutoDomainMappingSpec + */ + public function setSpec(Google_Service_CloudRun_AutoDomainMappingSpec $spec) + { + $this->spec = $spec; + } + /** + * @return Google_Service_CloudRun_AutoDomainMappingSpec + */ + public function getSpec() + { + return $this->spec; + } + /** + * @param Google_Service_CloudRun_AutoDomainMappingStatus + */ + public function setStatus(Google_Service_CloudRun_AutoDomainMappingStatus $status) + { + $this->status = $status; + } + /** + * @return Google_Service_CloudRun_AutoDomainMappingStatus + */ + public function getStatus() + { + return $this->status; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/AutoDomainMappingSpec.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/AutoDomainMappingSpec.php new file mode 100644 index 0000000..21bd15c --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/AutoDomainMappingSpec.php @@ -0,0 +1,48 @@ +certificateMode = $certificateMode; + } + public function getCertificateMode() + { + return $this->certificateMode; + } + public function setExpansionType($expansionType) + { + $this->expansionType = $expansionType; + } + public function getExpansionType() + { + return $this->expansionType; + } + public function setForceOverride($forceOverride) + { + $this->forceOverride = $forceOverride; + } + public function getForceOverride() + { + return $this->forceOverride; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/AutoDomainMappingStatus.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/AutoDomainMappingStatus.php new file mode 100644 index 0000000..922f08a --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/AutoDomainMappingStatus.php @@ -0,0 +1,63 @@ +conditions = $conditions; + } + /** + * @return Google_Service_CloudRun_GoogleCloudRunV1Condition + */ + public function getConditions() + { + return $this->conditions; + } + public function setObservedGeneration($observedGeneration) + { + $this->observedGeneration = $observedGeneration; + } + public function getObservedGeneration() + { + return $this->observedGeneration; + } + /** + * @param Google_Service_CloudRun_ResourceRecord + */ + public function setResourceRecords($resourceRecords) + { + $this->resourceRecords = $resourceRecords; + } + /** + * @return Google_Service_CloudRun_ResourceRecord + */ + public function getResourceRecords() + { + return $this->resourceRecords; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/Binding.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Binding.php new file mode 100644 index 0000000..84db227 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Binding.php @@ -0,0 +1,56 @@ +condition = $condition; + } + /** + * @return Google_Service_CloudRun_Expr + */ + public function getCondition() + { + return $this->condition; + } + public function setMembers($members) + { + $this->members = $members; + } + public function getMembers() + { + return $this->members; + } + public function setRole($role) + { + $this->role = $role; + } + public function getRole() + { + return $this->role; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testDirectoryNode.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ConfigMapEnvSource.php similarity index 51% rename from vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testDirectoryNode.php rename to vendor/google/apiclient-services/src/Google/Service/CloudRun/ConfigMapEnvSource.php index 245e59a..bc2119d 100644 --- a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testDirectoryNode.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ConfigMapEnvSource.php @@ -15,25 +15,26 @@ * the License. */ -class Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testDirectoryNode extends Google_Model +class Google_Service_CloudRun_ConfigMapEnvSource extends Google_Model { - protected $digestType = 'Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testDigest'; - protected $digestDataType = ''; + protected $localObjectReferenceType = 'Google_Service_CloudRun_LocalObjectReference'; + protected $localObjectReferenceDataType = ''; public $name; + public $optional; /** - * @param Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testDigest + * @param Google_Service_CloudRun_LocalObjectReference */ - public function setDigest(Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testDigest $digest) + public function setLocalObjectReference(Google_Service_CloudRun_LocalObjectReference $localObjectReference) { - $this->digest = $digest; + $this->localObjectReference = $localObjectReference; } /** - * @return Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testDigest + * @return Google_Service_CloudRun_LocalObjectReference */ - public function getDigest() + public function getLocalObjectReference() { - return $this->digest; + return $this->localObjectReference; } public function setName($name) { @@ -43,4 +44,12 @@ class Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testDir { return $this->name; } + public function setOptional($optional) + { + $this->optional = $optional; + } + public function getOptional() + { + return $this->optional; + } } diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/ConfigMapKeySelector.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ConfigMapKeySelector.php new file mode 100644 index 0000000..9ef8ba3 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ConfigMapKeySelector.php @@ -0,0 +1,64 @@ +key = $key; + } + public function getKey() + { + return $this->key; + } + /** + * @param Google_Service_CloudRun_LocalObjectReference + */ + public function setLocalObjectReference(Google_Service_CloudRun_LocalObjectReference $localObjectReference) + { + $this->localObjectReference = $localObjectReference; + } + /** + * @return Google_Service_CloudRun_LocalObjectReference + */ + public function getLocalObjectReference() + { + return $this->localObjectReference; + } + public function setName($name) + { + $this->name = $name; + } + public function getName() + { + return $this->name; + } + public function setOptional($optional) + { + $this->optional = $optional; + } + public function getOptional() + { + return $this->optional; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/ConfigMapVolumeSource.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ConfigMapVolumeSource.php new file mode 100644 index 0000000..9218d57 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ConfigMapVolumeSource.php @@ -0,0 +1,65 @@ +defaultMode = $defaultMode; + } + public function getDefaultMode() + { + return $this->defaultMode; + } + /** + * @param Google_Service_CloudRun_KeyToPath + */ + public function setItems($items) + { + $this->items = $items; + } + /** + * @return Google_Service_CloudRun_KeyToPath + */ + public function getItems() + { + return $this->items; + } + public function setName($name) + { + $this->name = $name; + } + public function getName() + { + return $this->name; + } + public function setOptional($optional) + { + $this->optional = $optional; + } + public function getOptional() + { + return $this->optional; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/Configuration.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Configuration.php new file mode 100644 index 0000000..987d0a2 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Configuration.php @@ -0,0 +1,87 @@ +apiVersion = $apiVersion; + } + public function getApiVersion() + { + return $this->apiVersion; + } + public function setKind($kind) + { + $this->kind = $kind; + } + public function getKind() + { + return $this->kind; + } + /** + * @param Google_Service_CloudRun_ObjectMeta + */ + public function setMetadata(Google_Service_CloudRun_ObjectMeta $metadata) + { + $this->metadata = $metadata; + } + /** + * @return Google_Service_CloudRun_ObjectMeta + */ + public function getMetadata() + { + return $this->metadata; + } + /** + * @param Google_Service_CloudRun_ConfigurationSpec + */ + public function setSpec(Google_Service_CloudRun_ConfigurationSpec $spec) + { + $this->spec = $spec; + } + /** + * @return Google_Service_CloudRun_ConfigurationSpec + */ + public function getSpec() + { + return $this->spec; + } + /** + * @param Google_Service_CloudRun_ConfigurationStatus + */ + public function setStatus(Google_Service_CloudRun_ConfigurationStatus $status) + { + $this->status = $status; + } + /** + * @return Google_Service_CloudRun_ConfigurationStatus + */ + public function getStatus() + { + return $this->status; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dataflow/ListSnapshotsResponse.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ConfigurationSpec.php similarity index 58% rename from vendor/google/apiclient-services/src/Google/Service/Dataflow/ListSnapshotsResponse.php rename to vendor/google/apiclient-services/src/Google/Service/CloudRun/ConfigurationSpec.php index 8393d21..ca816bb 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dataflow/ListSnapshotsResponse.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ConfigurationSpec.php @@ -15,24 +15,23 @@ * the License. */ -class Google_Service_Dataflow_ListSnapshotsResponse extends Google_Collection +class Google_Service_CloudRun_ConfigurationSpec extends Google_Model { - protected $collection_key = 'snapshots'; - protected $snapshotsType = 'Google_Service_Dataflow_Snapshot'; - protected $snapshotsDataType = 'array'; + protected $templateType = 'Google_Service_CloudRun_RevisionTemplate'; + protected $templateDataType = ''; /** - * @param Google_Service_Dataflow_Snapshot + * @param Google_Service_CloudRun_RevisionTemplate */ - public function setSnapshots($snapshots) + public function setTemplate(Google_Service_CloudRun_RevisionTemplate $template) { - $this->snapshots = $snapshots; + $this->template = $template; } /** - * @return Google_Service_Dataflow_Snapshot + * @return Google_Service_CloudRun_RevisionTemplate */ - public function getSnapshots() + public function getTemplate() { - return $this->snapshots; + return $this->template; } } diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/ConfigurationStatus.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ConfigurationStatus.php new file mode 100644 index 0000000..d81ddeb --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ConfigurationStatus.php @@ -0,0 +1,65 @@ +conditions = $conditions; + } + /** + * @return Google_Service_CloudRun_GoogleCloudRunV1Condition + */ + public function getConditions() + { + return $this->conditions; + } + public function setLatestCreatedRevisionName($latestCreatedRevisionName) + { + $this->latestCreatedRevisionName = $latestCreatedRevisionName; + } + public function getLatestCreatedRevisionName() + { + return $this->latestCreatedRevisionName; + } + public function setLatestReadyRevisionName($latestReadyRevisionName) + { + $this->latestReadyRevisionName = $latestReadyRevisionName; + } + public function getLatestReadyRevisionName() + { + return $this->latestReadyRevisionName; + } + public function setObservedGeneration($observedGeneration) + { + $this->observedGeneration = $observedGeneration; + } + public function getObservedGeneration() + { + return $this->observedGeneration; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/Container.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Container.php new file mode 100644 index 0000000..fa88d52 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Container.php @@ -0,0 +1,222 @@ +args = $args; + } + public function getArgs() + { + return $this->args; + } + public function setCommand($command) + { + $this->command = $command; + } + public function getCommand() + { + return $this->command; + } + /** + * @param Google_Service_CloudRun_EnvVar + */ + public function setEnv($env) + { + $this->env = $env; + } + /** + * @return Google_Service_CloudRun_EnvVar + */ + public function getEnv() + { + return $this->env; + } + /** + * @param Google_Service_CloudRun_EnvFromSource + */ + public function setEnvFrom($envFrom) + { + $this->envFrom = $envFrom; + } + /** + * @return Google_Service_CloudRun_EnvFromSource + */ + public function getEnvFrom() + { + return $this->envFrom; + } + public function setImage($image) + { + $this->image = $image; + } + public function getImage() + { + return $this->image; + } + public function setImagePullPolicy($imagePullPolicy) + { + $this->imagePullPolicy = $imagePullPolicy; + } + public function getImagePullPolicy() + { + return $this->imagePullPolicy; + } + /** + * @param Google_Service_CloudRun_Probe + */ + public function setLivenessProbe(Google_Service_CloudRun_Probe $livenessProbe) + { + $this->livenessProbe = $livenessProbe; + } + /** + * @return Google_Service_CloudRun_Probe + */ + public function getLivenessProbe() + { + return $this->livenessProbe; + } + public function setName($name) + { + $this->name = $name; + } + public function getName() + { + return $this->name; + } + /** + * @param Google_Service_CloudRun_ContainerPort + */ + public function setPorts($ports) + { + $this->ports = $ports; + } + /** + * @return Google_Service_CloudRun_ContainerPort + */ + public function getPorts() + { + return $this->ports; + } + /** + * @param Google_Service_CloudRun_Probe + */ + public function setReadinessProbe(Google_Service_CloudRun_Probe $readinessProbe) + { + $this->readinessProbe = $readinessProbe; + } + /** + * @return Google_Service_CloudRun_Probe + */ + public function getReadinessProbe() + { + return $this->readinessProbe; + } + /** + * @param Google_Service_CloudRun_ResourceRequirements + */ + public function setResources(Google_Service_CloudRun_ResourceRequirements $resources) + { + $this->resources = $resources; + } + /** + * @return Google_Service_CloudRun_ResourceRequirements + */ + public function getResources() + { + return $this->resources; + } + /** + * @param Google_Service_CloudRun_SecurityContext + */ + public function setSecurityContext(Google_Service_CloudRun_SecurityContext $securityContext) + { + $this->securityContext = $securityContext; + } + /** + * @return Google_Service_CloudRun_SecurityContext + */ + public function getSecurityContext() + { + return $this->securityContext; + } + public function setTerminationMessagePath($terminationMessagePath) + { + $this->terminationMessagePath = $terminationMessagePath; + } + public function getTerminationMessagePath() + { + return $this->terminationMessagePath; + } + public function setTerminationMessagePolicy($terminationMessagePolicy) + { + $this->terminationMessagePolicy = $terminationMessagePolicy; + } + public function getTerminationMessagePolicy() + { + return $this->terminationMessagePolicy; + } + /** + * @param Google_Service_CloudRun_VolumeMount + */ + public function setVolumeMounts($volumeMounts) + { + $this->volumeMounts = $volumeMounts; + } + /** + * @return Google_Service_CloudRun_VolumeMount + */ + public function getVolumeMounts() + { + return $this->volumeMounts; + } + public function setWorkingDir($workingDir) + { + $this->workingDir = $workingDir; + } + public function getWorkingDir() + { + return $this->workingDir; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/ContainerPort.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ContainerPort.php new file mode 100644 index 0000000..d94d368 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ContainerPort.php @@ -0,0 +1,48 @@ +containerPort = $containerPort; + } + public function getContainerPort() + { + return $this->containerPort; + } + public function setName($name) + { + $this->name = $name; + } + public function getName() + { + return $this->name; + } + public function setProtocol($protocol) + { + $this->protocol = $protocol; + } + public function getProtocol() + { + return $this->protocol; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/DomainMapping.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/DomainMapping.php new file mode 100644 index 0000000..0c1a38f --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/DomainMapping.php @@ -0,0 +1,87 @@ +apiVersion = $apiVersion; + } + public function getApiVersion() + { + return $this->apiVersion; + } + public function setKind($kind) + { + $this->kind = $kind; + } + public function getKind() + { + return $this->kind; + } + /** + * @param Google_Service_CloudRun_ObjectMeta + */ + public function setMetadata(Google_Service_CloudRun_ObjectMeta $metadata) + { + $this->metadata = $metadata; + } + /** + * @return Google_Service_CloudRun_ObjectMeta + */ + public function getMetadata() + { + return $this->metadata; + } + /** + * @param Google_Service_CloudRun_DomainMappingSpec + */ + public function setSpec(Google_Service_CloudRun_DomainMappingSpec $spec) + { + $this->spec = $spec; + } + /** + * @return Google_Service_CloudRun_DomainMappingSpec + */ + public function getSpec() + { + return $this->spec; + } + /** + * @param Google_Service_CloudRun_DomainMappingStatus + */ + public function setStatus(Google_Service_CloudRun_DomainMappingStatus $status) + { + $this->status = $status; + } + /** + * @return Google_Service_CloudRun_DomainMappingStatus + */ + public function getStatus() + { + return $this->status; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/DomainMappingSpec.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/DomainMappingSpec.php new file mode 100644 index 0000000..67dad26 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/DomainMappingSpec.php @@ -0,0 +1,48 @@ +certificateMode = $certificateMode; + } + public function getCertificateMode() + { + return $this->certificateMode; + } + public function setForceOverride($forceOverride) + { + $this->forceOverride = $forceOverride; + } + public function getForceOverride() + { + return $this->forceOverride; + } + public function setRouteName($routeName) + { + $this->routeName = $routeName; + } + public function getRouteName() + { + return $this->routeName; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/DomainMappingStatus.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/DomainMappingStatus.php new file mode 100644 index 0000000..4400d48 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/DomainMappingStatus.php @@ -0,0 +1,72 @@ +conditions = $conditions; + } + /** + * @return Google_Service_CloudRun_GoogleCloudRunV1Condition + */ + public function getConditions() + { + return $this->conditions; + } + public function setMappedRouteName($mappedRouteName) + { + $this->mappedRouteName = $mappedRouteName; + } + public function getMappedRouteName() + { + return $this->mappedRouteName; + } + public function setObservedGeneration($observedGeneration) + { + $this->observedGeneration = $observedGeneration; + } + public function getObservedGeneration() + { + return $this->observedGeneration; + } + /** + * @param Google_Service_CloudRun_ResourceRecord + */ + public function setResourceRecords($resourceRecords) + { + $this->resourceRecords = $resourceRecords; + } + /** + * @return Google_Service_CloudRun_ResourceRecord + */ + public function getResourceRecords() + { + return $this->resourceRecords; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/EnvFromSource.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/EnvFromSource.php new file mode 100644 index 0000000..c9804fd --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/EnvFromSource.php @@ -0,0 +1,62 @@ +configMapRef = $configMapRef; + } + /** + * @return Google_Service_CloudRun_ConfigMapEnvSource + */ + public function getConfigMapRef() + { + return $this->configMapRef; + } + public function setPrefix($prefix) + { + $this->prefix = $prefix; + } + public function getPrefix() + { + return $this->prefix; + } + /** + * @param Google_Service_CloudRun_SecretEnvSource + */ + public function setSecretRef(Google_Service_CloudRun_SecretEnvSource $secretRef) + { + $this->secretRef = $secretRef; + } + /** + * @return Google_Service_CloudRun_SecretEnvSource + */ + public function getSecretRef() + { + return $this->secretRef; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/EnvVar.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/EnvVar.php new file mode 100644 index 0000000..8991f6c --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/EnvVar.php @@ -0,0 +1,55 @@ +name = $name; + } + public function getName() + { + return $this->name; + } + public function setValue($value) + { + $this->value = $value; + } + public function getValue() + { + return $this->value; + } + /** + * @param Google_Service_CloudRun_EnvVarSource + */ + public function setValueFrom(Google_Service_CloudRun_EnvVarSource $valueFrom) + { + $this->valueFrom = $valueFrom; + } + /** + * @return Google_Service_CloudRun_EnvVarSource + */ + public function getValueFrom() + { + return $this->valueFrom; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/EnvVarSource.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/EnvVarSource.php new file mode 100644 index 0000000..9d0d704 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/EnvVarSource.php @@ -0,0 +1,53 @@ +configMapKeyRef = $configMapKeyRef; + } + /** + * @return Google_Service_CloudRun_ConfigMapKeySelector + */ + public function getConfigMapKeyRef() + { + return $this->configMapKeyRef; + } + /** + * @param Google_Service_CloudRun_SecretKeySelector + */ + public function setSecretKeyRef(Google_Service_CloudRun_SecretKeySelector $secretKeyRef) + { + $this->secretKeyRef = $secretKeyRef; + } + /** + * @return Google_Service_CloudRun_SecretKeySelector + */ + public function getSecretKeyRef() + { + return $this->secretKeyRef; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/ResourceAnnotation.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ExecAction.php similarity index 74% rename from vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/ResourceAnnotation.php rename to vendor/google/apiclient-services/src/Google/Service/CloudRun/ExecAction.php index 065b52b..9ea76da 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/ResourceAnnotation.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ExecAction.php @@ -15,16 +15,16 @@ * the License. */ -class Google_Service_CloudHealthcare_ResourceAnnotation extends Google_Model +class Google_Service_CloudRun_ExecAction extends Google_Model { - public $label; + public $command; - public function setLabel($label) + public function setCommand($command) { - $this->label = $label; + $this->command = $command; } - public function getLabel() + public function getCommand() { - return $this->label; + return $this->command; } } diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1WebDetectionWebEntity.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Expr.php similarity index 61% rename from vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1WebDetectionWebEntity.php rename to vendor/google/apiclient-services/src/Google/Service/CloudRun/Expr.php index b42ec06..3094ea3 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1WebDetectionWebEntity.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Expr.php @@ -15,11 +15,12 @@ * the License. */ -class Google_Service_Vision_GoogleCloudVisionV1p5beta1WebDetectionWebEntity extends Google_Model +class Google_Service_CloudRun_Expr extends Google_Model { public $description; - public $entityId; - public $score; + public $expression; + public $location; + public $title; public function setDescription($description) { @@ -29,20 +30,28 @@ class Google_Service_Vision_GoogleCloudVisionV1p5beta1WebDetectionWebEntity exte { return $this->description; } - public function setEntityId($entityId) + public function setExpression($expression) { - $this->entityId = $entityId; + $this->expression = $expression; } - public function getEntityId() + public function getExpression() { - return $this->entityId; + return $this->expression; } - public function setScore($score) + public function setLocation($location) { - $this->score = $score; + $this->location = $location; } - public function getScore() + public function getLocation() { - return $this->score; + return $this->location; + } + public function setTitle($title) + { + $this->title = $title; + } + public function getTitle() + { + return $this->title; } } diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/GoogleCloudRunV1Condition.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/GoogleCloudRunV1Condition.php new file mode 100644 index 0000000..df6b966 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/GoogleCloudRunV1Condition.php @@ -0,0 +1,75 @@ +lastTransitionTime = $lastTransitionTime; + } + public function getLastTransitionTime() + { + return $this->lastTransitionTime; + } + 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; + } + public function setSeverity($severity) + { + $this->severity = $severity; + } + public function getSeverity() + { + return $this->severity; + } + public function setStatus($status) + { + $this->status = $status; + } + public function getStatus() + { + return $this->status; + } + public function setType($type) + { + $this->type = $type; + } + public function getType() + { + return $this->type; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/HTTPGetAction.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/HTTPGetAction.php new file mode 100644 index 0000000..36b3065 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/HTTPGetAction.php @@ -0,0 +1,65 @@ +host = $host; + } + public function getHost() + { + return $this->host; + } + /** + * @param Google_Service_CloudRun_HTTPHeader + */ + public function setHttpHeaders($httpHeaders) + { + $this->httpHeaders = $httpHeaders; + } + /** + * @return Google_Service_CloudRun_HTTPHeader + */ + public function getHttpHeaders() + { + return $this->httpHeaders; + } + public function setPath($path) + { + $this->path = $path; + } + public function getPath() + { + return $this->path; + } + public function setScheme($scheme) + { + $this->scheme = $scheme; + } + public function getScheme() + { + return $this->scheme; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testCommandEnvironmentVariable.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/HTTPHeader.php similarity index 87% rename from vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testCommandEnvironmentVariable.php rename to vendor/google/apiclient-services/src/Google/Service/CloudRun/HTTPHeader.php index 66a4932..a884bde 100644 --- a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testCommandEnvironmentVariable.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/HTTPHeader.php @@ -15,7 +15,7 @@ * the License. */ -class Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testCommandEnvironmentVariable extends Google_Model +class Google_Service_CloudRun_HTTPHeader extends Google_Model { public $name; public $value; diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/Handler.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Handler.php new file mode 100644 index 0000000..f2491eb --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Handler.php @@ -0,0 +1,69 @@ +exec = $exec; + } + /** + * @return Google_Service_CloudRun_ExecAction + */ + public function getExec() + { + return $this->exec; + } + /** + * @param Google_Service_CloudRun_HTTPGetAction + */ + public function setHttpGet(Google_Service_CloudRun_HTTPGetAction $httpGet) + { + $this->httpGet = $httpGet; + } + /** + * @return Google_Service_CloudRun_HTTPGetAction + */ + public function getHttpGet() + { + return $this->httpGet; + } + /** + * @param Google_Service_CloudRun_TCPSocketAction + */ + public function setTcpSocket(Google_Service_CloudRun_TCPSocketAction $tcpSocket) + { + $this->tcpSocket = $tcpSocket; + } + /** + * @return Google_Service_CloudRun_TCPSocketAction + */ + public function getTcpSocket() + { + return $this->tcpSocket; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Finding.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/IntOrString.php similarity index 57% rename from vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Finding.php rename to vendor/google/apiclient-services/src/Google/Service/CloudRun/IntOrString.php index 33b5774..c4404f0 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Finding.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/IntOrString.php @@ -15,34 +15,34 @@ * the License. */ -class Google_Service_CloudHealthcare_Finding extends Google_Model +class Google_Service_CloudRun_IntOrString extends Google_Model { - public $end; - public $infoType; - public $start; + public $intVal; + public $strVal; + public $type; - public function setEnd($end) + public function setIntVal($intVal) { - $this->end = $end; + $this->intVal = $intVal; } - public function getEnd() + public function getIntVal() { - return $this->end; + return $this->intVal; } - public function setInfoType($infoType) + public function setStrVal($strVal) { - $this->infoType = $infoType; + $this->strVal = $strVal; } - public function getInfoType() + public function getStrVal() { - return $this->infoType; + return $this->strVal; } - public function setStart($start) + public function setType($type) { - $this->start = $start; + $this->type = $type; } - public function getStart() + public function getType() { - return $this->start; + return $this->type; } } diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/KeyToPath.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/KeyToPath.php new file mode 100644 index 0000000..0c43c65 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/KeyToPath.php @@ -0,0 +1,48 @@ +key = $key; + } + public function getKey() + { + return $this->key; + } + public function setMode($mode) + { + $this->mode = $mode; + } + public function getMode() + { + return $this->mode; + } + public function setPath($path) + { + $this->path = $path; + } + public function getPath() + { + return $this->path; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/ListAnnotationsResponse.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ListAuthorizedDomainsResponse.php similarity index 62% rename from vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/ListAnnotationsResponse.php rename to vendor/google/apiclient-services/src/Google/Service/CloudRun/ListAuthorizedDomainsResponse.php index fcf4e6b..2adb592 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/ListAnnotationsResponse.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ListAuthorizedDomainsResponse.php @@ -15,19 +15,26 @@ * the License. */ -class Google_Service_CloudHealthcare_ListAnnotationsResponse extends Google_Collection +class Google_Service_CloudRun_ListAuthorizedDomainsResponse extends Google_Collection { - protected $collection_key = 'annotations'; - public $annotations; + protected $collection_key = 'domains'; + protected $domainsType = 'Google_Service_CloudRun_AuthorizedDomain'; + protected $domainsDataType = 'array'; public $nextPageToken; - public function setAnnotations($annotations) + /** + * @param Google_Service_CloudRun_AuthorizedDomain + */ + public function setDomains($domains) { - $this->annotations = $annotations; + $this->domains = $domains; } - public function getAnnotations() + /** + * @return Google_Service_CloudRun_AuthorizedDomain + */ + public function getDomains() { - return $this->annotations; + return $this->domains; } public function setNextPageToken($nextPageToken) { diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/ListAutoDomainMappingsResponse.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ListAutoDomainMappingsResponse.php new file mode 100644 index 0000000..f7a0242 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ListAutoDomainMappingsResponse.php @@ -0,0 +1,81 @@ +apiVersion = $apiVersion; + } + public function getApiVersion() + { + return $this->apiVersion; + } + /** + * @param Google_Service_CloudRun_AutoDomainMapping + */ + public function setItems($items) + { + $this->items = $items; + } + /** + * @return Google_Service_CloudRun_AutoDomainMapping + */ + public function getItems() + { + return $this->items; + } + public function setKind($kind) + { + $this->kind = $kind; + } + public function getKind() + { + return $this->kind; + } + /** + * @param Google_Service_CloudRun_ListMeta + */ + public function setMetadata(Google_Service_CloudRun_ListMeta $metadata) + { + $this->metadata = $metadata; + } + /** + * @return Google_Service_CloudRun_ListMeta + */ + public function getMetadata() + { + return $this->metadata; + } + public function setUnreachable($unreachable) + { + $this->unreachable = $unreachable; + } + public function getUnreachable() + { + return $this->unreachable; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/ListConfigurationsResponse.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ListConfigurationsResponse.php new file mode 100644 index 0000000..010cefd --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ListConfigurationsResponse.php @@ -0,0 +1,81 @@ +apiVersion = $apiVersion; + } + public function getApiVersion() + { + return $this->apiVersion; + } + /** + * @param Google_Service_CloudRun_Configuration + */ + public function setItems($items) + { + $this->items = $items; + } + /** + * @return Google_Service_CloudRun_Configuration + */ + public function getItems() + { + return $this->items; + } + public function setKind($kind) + { + $this->kind = $kind; + } + public function getKind() + { + return $this->kind; + } + /** + * @param Google_Service_CloudRun_ListMeta + */ + public function setMetadata(Google_Service_CloudRun_ListMeta $metadata) + { + $this->metadata = $metadata; + } + /** + * @return Google_Service_CloudRun_ListMeta + */ + public function getMetadata() + { + return $this->metadata; + } + public function setUnreachable($unreachable) + { + $this->unreachable = $unreachable; + } + public function getUnreachable() + { + return $this->unreachable; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/ListDomainMappingsResponse.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ListDomainMappingsResponse.php new file mode 100644 index 0000000..b52fafb --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ListDomainMappingsResponse.php @@ -0,0 +1,81 @@ +apiVersion = $apiVersion; + } + public function getApiVersion() + { + return $this->apiVersion; + } + /** + * @param Google_Service_CloudRun_DomainMapping + */ + public function setItems($items) + { + $this->items = $items; + } + /** + * @return Google_Service_CloudRun_DomainMapping + */ + public function getItems() + { + return $this->items; + } + public function setKind($kind) + { + $this->kind = $kind; + } + public function getKind() + { + return $this->kind; + } + /** + * @param Google_Service_CloudRun_ListMeta + */ + public function setMetadata(Google_Service_CloudRun_ListMeta $metadata) + { + $this->metadata = $metadata; + } + /** + * @return Google_Service_CloudRun_ListMeta + */ + public function getMetadata() + { + return $this->metadata; + } + public function setUnreachable($unreachable) + { + $this->unreachable = $unreachable; + } + public function getUnreachable() + { + return $this->unreachable; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/ListMeta.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ListMeta.php new file mode 100644 index 0000000..3e0cc77 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ListMeta.php @@ -0,0 +1,48 @@ +continue = $continue; + } + public function getContinue() + { + return $this->continue; + } + public function setResourceVersion($resourceVersion) + { + $this->resourceVersion = $resourceVersion; + } + public function getResourceVersion() + { + return $this->resourceVersion; + } + public function setSelfLink($selfLink) + { + $this->selfLink = $selfLink; + } + public function getSelfLink() + { + return $this->selfLink; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/ListRevisionsResponse.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ListRevisionsResponse.php new file mode 100644 index 0000000..e908459 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ListRevisionsResponse.php @@ -0,0 +1,81 @@ +apiVersion = $apiVersion; + } + public function getApiVersion() + { + return $this->apiVersion; + } + /** + * @param Google_Service_CloudRun_Revision + */ + public function setItems($items) + { + $this->items = $items; + } + /** + * @return Google_Service_CloudRun_Revision + */ + public function getItems() + { + return $this->items; + } + public function setKind($kind) + { + $this->kind = $kind; + } + public function getKind() + { + return $this->kind; + } + /** + * @param Google_Service_CloudRun_ListMeta + */ + public function setMetadata(Google_Service_CloudRun_ListMeta $metadata) + { + $this->metadata = $metadata; + } + /** + * @return Google_Service_CloudRun_ListMeta + */ + public function getMetadata() + { + return $this->metadata; + } + public function setUnreachable($unreachable) + { + $this->unreachable = $unreachable; + } + public function getUnreachable() + { + return $this->unreachable; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/ListRoutesResponse.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ListRoutesResponse.php new file mode 100644 index 0000000..02f31e5 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ListRoutesResponse.php @@ -0,0 +1,81 @@ +apiVersion = $apiVersion; + } + public function getApiVersion() + { + return $this->apiVersion; + } + /** + * @param Google_Service_CloudRun_Route + */ + public function setItems($items) + { + $this->items = $items; + } + /** + * @return Google_Service_CloudRun_Route + */ + public function getItems() + { + return $this->items; + } + public function setKind($kind) + { + $this->kind = $kind; + } + public function getKind() + { + return $this->kind; + } + /** + * @param Google_Service_CloudRun_ListMeta + */ + public function setMetadata(Google_Service_CloudRun_ListMeta $metadata) + { + $this->metadata = $metadata; + } + /** + * @return Google_Service_CloudRun_ListMeta + */ + public function getMetadata() + { + return $this->metadata; + } + public function setUnreachable($unreachable) + { + $this->unreachable = $unreachable; + } + public function getUnreachable() + { + return $this->unreachable; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/ListServicesResponse.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ListServicesResponse.php new file mode 100644 index 0000000..1cffd1a --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ListServicesResponse.php @@ -0,0 +1,81 @@ +apiVersion = $apiVersion; + } + public function getApiVersion() + { + return $this->apiVersion; + } + /** + * @param Google_Service_CloudRun_Service + */ + public function setItems($items) + { + $this->items = $items; + } + /** + * @return Google_Service_CloudRun_Service + */ + public function getItems() + { + return $this->items; + } + public function setKind($kind) + { + $this->kind = $kind; + } + public function getKind() + { + return $this->kind; + } + /** + * @param Google_Service_CloudRun_ListMeta + */ + public function setMetadata(Google_Service_CloudRun_ListMeta $metadata) + { + $this->metadata = $metadata; + } + /** + * @return Google_Service_CloudRun_ListMeta + */ + public function getMetadata() + { + return $this->metadata; + } + public function setUnreachable($unreachable) + { + $this->unreachable = $unreachable; + } + public function getUnreachable() + { + return $this->unreachable; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/CloudHealthcareSource.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/LocalObjectReference.php similarity index 90% rename from vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/CloudHealthcareSource.php rename to vendor/google/apiclient-services/src/Google/Service/CloudRun/LocalObjectReference.php index f6689bb..d19a83f 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/CloudHealthcareSource.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/LocalObjectReference.php @@ -15,7 +15,7 @@ * the License. */ -class Google_Service_CloudHealthcare_CloudHealthcareSource extends Google_Model +class Google_Service_CloudRun_LocalObjectReference extends Google_Model { public $name; diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/ObjectMeta.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ObjectMeta.php new file mode 100644 index 0000000..874e7e4 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ObjectMeta.php @@ -0,0 +1,164 @@ +annotations = $annotations; + } + public function getAnnotations() + { + return $this->annotations; + } + public function setClusterName($clusterName) + { + $this->clusterName = $clusterName; + } + public function getClusterName() + { + return $this->clusterName; + } + public function setCreationTimestamp($creationTimestamp) + { + $this->creationTimestamp = $creationTimestamp; + } + public function getCreationTimestamp() + { + return $this->creationTimestamp; + } + public function setDeletionGracePeriodSeconds($deletionGracePeriodSeconds) + { + $this->deletionGracePeriodSeconds = $deletionGracePeriodSeconds; + } + public function getDeletionGracePeriodSeconds() + { + return $this->deletionGracePeriodSeconds; + } + public function setDeletionTimestamp($deletionTimestamp) + { + $this->deletionTimestamp = $deletionTimestamp; + } + public function getDeletionTimestamp() + { + return $this->deletionTimestamp; + } + public function setFinalizers($finalizers) + { + $this->finalizers = $finalizers; + } + public function getFinalizers() + { + return $this->finalizers; + } + public function setGenerateName($generateName) + { + $this->generateName = $generateName; + } + public function getGenerateName() + { + return $this->generateName; + } + public function setGeneration($generation) + { + $this->generation = $generation; + } + public function getGeneration() + { + return $this->generation; + } + 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 setNamespace($namespace) + { + $this->namespace = $namespace; + } + public function getNamespace() + { + return $this->namespace; + } + /** + * @param Google_Service_CloudRun_OwnerReference + */ + public function setOwnerReferences($ownerReferences) + { + $this->ownerReferences = $ownerReferences; + } + /** + * @return Google_Service_CloudRun_OwnerReference + */ + public function getOwnerReferences() + { + return $this->ownerReferences; + } + public function setResourceVersion($resourceVersion) + { + $this->resourceVersion = $resourceVersion; + } + public function getResourceVersion() + { + return $this->resourceVersion; + } + public function setSelfLink($selfLink) + { + $this->selfLink = $selfLink; + } + public function getSelfLink() + { + return $this->selfLink; + } + public function setUid($uid) + { + $this->uid = $uid; + } + public function getUid() + { + return $this->uid; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/OwnerReference.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/OwnerReference.php new file mode 100644 index 0000000..5e9af02 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/OwnerReference.php @@ -0,0 +1,75 @@ +apiVersion = $apiVersion; + } + public function getApiVersion() + { + return $this->apiVersion; + } + public function setBlockOwnerDeletion($blockOwnerDeletion) + { + $this->blockOwnerDeletion = $blockOwnerDeletion; + } + public function getBlockOwnerDeletion() + { + return $this->blockOwnerDeletion; + } + public function setController($controller) + { + $this->controller = $controller; + } + public function getController() + { + return $this->controller; + } + 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 setUid($uid) + { + $this->uid = $uid; + } + public function getUid() + { + return $this->uid; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/Policy.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Policy.php new file mode 100644 index 0000000..0bf0a1f --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Policy.php @@ -0,0 +1,72 @@ +auditConfigs = $auditConfigs; + } + /** + * @return Google_Service_CloudRun_AuditConfig + */ + public function getAuditConfigs() + { + return $this->auditConfigs; + } + /** + * @param Google_Service_CloudRun_Binding + */ + public function setBindings($bindings) + { + $this->bindings = $bindings; + } + /** + * @return Google_Service_CloudRun_Binding + */ + public function getBindings() + { + return $this->bindings; + } + public function setEtag($etag) + { + $this->etag = $etag; + } + public function getEtag() + { + return $this->etag; + } + public function setVersion($version) + { + $this->version = $version; + } + public function getVersion() + { + return $this->version; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/Probe.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Probe.php new file mode 100644 index 0000000..9366014 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Probe.php @@ -0,0 +1,82 @@ +failureThreshold = $failureThreshold; + } + public function getFailureThreshold() + { + return $this->failureThreshold; + } + /** + * @param Google_Service_CloudRun_Handler + */ + public function setHandler(Google_Service_CloudRun_Handler $handler) + { + $this->handler = $handler; + } + /** + * @return Google_Service_CloudRun_Handler + */ + public function getHandler() + { + return $this->handler; + } + public function setInitialDelaySeconds($initialDelaySeconds) + { + $this->initialDelaySeconds = $initialDelaySeconds; + } + public function getInitialDelaySeconds() + { + return $this->initialDelaySeconds; + } + public function setPeriodSeconds($periodSeconds) + { + $this->periodSeconds = $periodSeconds; + } + public function getPeriodSeconds() + { + return $this->periodSeconds; + } + public function setSuccessThreshold($successThreshold) + { + $this->successThreshold = $successThreshold; + } + public function getSuccessThreshold() + { + return $this->successThreshold; + } + public function setTimeoutSeconds($timeoutSeconds) + { + $this->timeoutSeconds = $timeoutSeconds; + } + public function getTimeoutSeconds() + { + return $this->timeoutSeconds; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/Namespaces.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/Namespaces.php new file mode 100644 index 0000000..e7405a7 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/Namespaces.php @@ -0,0 +1,28 @@ + + * $runService = new Google_Service_CloudRun(...); + * $namespaces = $runService->namespaces; + * + */ +class Google_Service_CloudRun_Resource_Namespaces extends Google_Service_Resource +{ +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/NamespacesAuthorizeddomains.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/NamespacesAuthorizeddomains.php new file mode 100644 index 0000000..ee475c1 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/NamespacesAuthorizeddomains.php @@ -0,0 +1,46 @@ + + * $runService = new Google_Service_CloudRun(...); + * $authorizeddomains = $runService->authorizeddomains; + * + */ +class Google_Service_CloudRun_Resource_NamespacesAuthorizeddomains extends Google_Service_Resource +{ + /** + * List authorized domains. (authorizeddomains.listNamespacesAuthorizeddomains) + * + * @param string $parent Name of the parent Application resource. Example: + * `apps/myapp`. + * @param array $optParams Optional parameters. + * + * @opt_param string pageToken Continuation token for fetching the next page of + * results. + * @opt_param int pageSize Maximum results to return per page. + * @return Google_Service_CloudRun_ListAuthorizedDomainsResponse + */ + public function listNamespacesAuthorizeddomains($parent, $optParams = array()) + { + $params = array('parent' => $parent); + $params = array_merge($params, $optParams); + return $this->call('list', array($params), "Google_Service_CloudRun_ListAuthorizedDomainsResponse"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/NamespacesAutodomainmappings.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/NamespacesAutodomainmappings.php new file mode 100644 index 0000000..2d38952 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/NamespacesAutodomainmappings.php @@ -0,0 +1,128 @@ + + * $runService = new Google_Service_CloudRun(...); + * $autodomainmappings = $runService->autodomainmappings; + * + */ +class Google_Service_CloudRun_Resource_NamespacesAutodomainmappings extends Google_Service_Resource +{ + /** + * Creates a new auto domain mapping. (autodomainmappings.create) + * + * @param string $parent The project ID or project number in which this auto + * domain mapping should be created. + * @param Google_Service_CloudRun_AutoDomainMapping $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_CloudRun_AutoDomainMapping + */ + public function create($parent, Google_Service_CloudRun_AutoDomainMapping $postBody, $optParams = array()) + { + $params = array('parent' => $parent, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('create', array($params), "Google_Service_CloudRun_AutoDomainMapping"); + } + /** + * Delete an auto domain mapping. (autodomainmappings.delete) + * + * @param string $name The name of the auto domain mapping being deleted. If + * needed, replace {namespace_id} with the project ID. + * @param array $optParams Optional parameters. + * + * @opt_param string apiVersion Cloud Run currently ignores this parameter. + * @opt_param string propagationPolicy Specifies the propagation policy of + * delete. Cloud Run currently ignores this setting, and deletes in the + * background. Please see kubernetes.io/docs/concepts/workloads/controllers + * /garbage-collection/ for more information. + * @opt_param string kind Cloud Run currently ignores this parameter. + * @return Google_Service_CloudRun_Status + */ + public function delete($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('delete', array($params), "Google_Service_CloudRun_Status"); + } + /** + * Get information about an auto domain mapping. (autodomainmappings.get) + * + * @param string $name The name of the auto domain mapping being retrieved. If + * needed, replace {namespace_id} with the project ID. + * @param array $optParams Optional parameters. + * @return Google_Service_CloudRun_AutoDomainMapping + */ + public function get($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('get', array($params), "Google_Service_CloudRun_AutoDomainMapping"); + } + /** + * List auto domain mappings. + * (autodomainmappings.listNamespacesAutodomainmappings) + * + * @param string $parent The project ID or project number from which the auto + * domain mappings should be listed. + * @param array $optParams Optional parameters. + * + * @opt_param string labelSelector Allows to filter resources based on a label. + * Supported operations are =, !=, exists, in, and notIn. + * @opt_param string fieldSelector Allows to filter resources based on a + * specific value for a field name. Send this in a query string format. i.e. + * 'metadata.name%3Dlorem'. Not currently used by Cloud Run. + * @opt_param bool includeUninitialized Not currently used by Cloud Run. + * @opt_param string resourceVersion The baseline resource version from which + * the list or watch operation should start. Not currently used by Cloud Run. + * @opt_param string continue Optional encoded string to continue paging. + * @opt_param int limit The maximum number of records that should be returned. + * @opt_param bool watch Flag that indicates that the client expects to watch + * this resource as well. Not currently used by Cloud Run. + * @return Google_Service_CloudRun_ListAutoDomainMappingsResponse + */ + public function listNamespacesAutodomainmappings($parent, $optParams = array()) + { + $params = array('parent' => $parent); + $params = array_merge($params, $optParams); + return $this->call('list', array($params), "Google_Service_CloudRun_ListAutoDomainMappingsResponse"); + } + /** + * Replace an auto domain mapping. + * + * Only the spec and metadata labels and annotations are modifiable. After the + * Update request, Cloud Run will work to make the 'status' match the requested + * 'spec'. + * + * May provide metadata.resourceVersion to enforce update from last read for + * optimistic concurrency control. (autodomainmappings.replaceAutoDomainMapping) + * + * @param string $name The name of the auto domain mapping being retrieved. If + * needed, replace {namespace_id} with the project ID. + * @param Google_Service_CloudRun_AutoDomainMapping $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_CloudRun_AutoDomainMapping + */ + public function replaceAutoDomainMapping($name, Google_Service_CloudRun_AutoDomainMapping $postBody, $optParams = array()) + { + $params = array('name' => $name, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('replaceAutoDomainMapping', array($params), "Google_Service_CloudRun_AutoDomainMapping"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/NamespacesConfigurations.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/NamespacesConfigurations.php new file mode 100644 index 0000000..1f3fc70 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/NamespacesConfigurations.php @@ -0,0 +1,129 @@ + + * $runService = new Google_Service_CloudRun(...); + * $configurations = $runService->configurations; + * + */ +class Google_Service_CloudRun_Resource_NamespacesConfigurations extends Google_Service_Resource +{ + /** + * Create a configuration. (configurations.create) + * + * @param string $parent The project ID or project number in which this + * configuration should be created. + * @param Google_Service_CloudRun_Configuration $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_CloudRun_Configuration + */ + public function create($parent, Google_Service_CloudRun_Configuration $postBody, $optParams = array()) + { + $params = array('parent' => $parent, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('create', array($params), "Google_Service_CloudRun_Configuration"); + } + /** + * delete a configuration. This will cause the configuration to delete all child + * revisions. Prior to calling this, any route referencing the configuration (or + * revision from the configuration) must be deleted. (configurations.delete) + * + * @param string $name The name of the configuration being deleted. If needed, + * replace {namespace_id} with the project ID. + * @param array $optParams Optional parameters. + * + * @opt_param string apiVersion Cloud Run currently ignores this parameter. + * @opt_param string propagationPolicy Specifies the propagation policy of + * delete. Cloud Run currently ignores this setting, and deletes in the + * background. Please see kubernetes.io/docs/concepts/workloads/controllers + * /garbage-collection/ for more information. + * @opt_param string kind Cloud Run currently ignores this parameter. + * @return Google_Service_CloudRun_Status + */ + public function delete($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('delete', array($params), "Google_Service_CloudRun_Status"); + } + /** + * Get information about a configuration. (configurations.get) + * + * @param string $name The name of the configuration being retrieved. If needed, + * replace {namespace_id} with the project ID. + * @param array $optParams Optional parameters. + * @return Google_Service_CloudRun_Configuration + */ + public function get($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('get', array($params), "Google_Service_CloudRun_Configuration"); + } + /** + * List configurations. (configurations.listNamespacesConfigurations) + * + * @param string $parent The project ID or project number from which the + * configurations should be listed. + * @param array $optParams Optional parameters. + * + * @opt_param string labelSelector Allows to filter resources based on a label. + * Supported operations are =, !=, exists, in, and notIn. + * @opt_param string resourceVersion The baseline resource version from which + * the list or watch operation should start. Not currently used by Cloud Run. + * @opt_param bool includeUninitialized Not currently used by Cloud Run. + * @opt_param string fieldSelector Allows to filter resources based on a + * specific value for a field name. Send this in a query string format. i.e. + * 'metadata.name%3Dlorem'. Not currently used by Cloud Run. + * @opt_param string continue Optional encoded string to continue paging. + * @opt_param int limit The maximum number of records that should be returned. + * @opt_param bool watch Flag that indicates that the client expects to watch + * this resource as well. Not currently used by Cloud Run. + * @return Google_Service_CloudRun_ListConfigurationsResponse + */ + public function listNamespacesConfigurations($parent, $optParams = array()) + { + $params = array('parent' => $parent); + $params = array_merge($params, $optParams); + return $this->call('list', array($params), "Google_Service_CloudRun_ListConfigurationsResponse"); + } + /** + * Replace a configuration. + * + * Only the spec and metadata labels and annotations are modifiable. After the + * Update request, Cloud Run will work to make the 'status' match the requested + * 'spec'. + * + * May provide metadata.resourceVersion to enforce update from last read for + * optimistic concurrency control. (configurations.replaceConfiguration) + * + * @param string $name The name of the configuration being retrieved. If needed, + * replace {namespace_id} with the project ID. + * @param Google_Service_CloudRun_Configuration $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_CloudRun_Configuration + */ + public function replaceConfiguration($name, Google_Service_CloudRun_Configuration $postBody, $optParams = array()) + { + $params = array('name' => $name, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('replaceConfiguration', array($params), "Google_Service_CloudRun_Configuration"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/NamespacesDomainmappings.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/NamespacesDomainmappings.php new file mode 100644 index 0000000..f20d1bc --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/NamespacesDomainmappings.php @@ -0,0 +1,127 @@ + + * $runService = new Google_Service_CloudRun(...); + * $domainmappings = $runService->domainmappings; + * + */ +class Google_Service_CloudRun_Resource_NamespacesDomainmappings extends Google_Service_Resource +{ + /** + * Create a new domain mapping. (domainmappings.create) + * + * @param string $parent The project ID or project number in which this domain + * mapping should be created. + * @param Google_Service_CloudRun_DomainMapping $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_CloudRun_DomainMapping + */ + public function create($parent, Google_Service_CloudRun_DomainMapping $postBody, $optParams = array()) + { + $params = array('parent' => $parent, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('create', array($params), "Google_Service_CloudRun_DomainMapping"); + } + /** + * Delete a domain mapping. (domainmappings.delete) + * + * @param string $name The name of the domain mapping being deleted. If needed, + * replace {namespace_id} with the project ID. + * @param array $optParams Optional parameters. + * + * @opt_param string apiVersion Cloud Run currently ignores this parameter. + * @opt_param string propagationPolicy Specifies the propagation policy of + * delete. Cloud Run currently ignores this setting, and deletes in the + * background. Please see kubernetes.io/docs/concepts/workloads/controllers + * /garbage-collection/ for more information. + * @opt_param string kind Cloud Run currently ignores this parameter. + * @return Google_Service_CloudRun_Status + */ + public function delete($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('delete', array($params), "Google_Service_CloudRun_Status"); + } + /** + * Get information about a domain mapping. (domainmappings.get) + * + * @param string $name The name of the domain mapping being retrieved. If + * needed, replace {namespace_id} with the project ID. + * @param array $optParams Optional parameters. + * @return Google_Service_CloudRun_DomainMapping + */ + public function get($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('get', array($params), "Google_Service_CloudRun_DomainMapping"); + } + /** + * List domain mappings. (domainmappings.listNamespacesDomainmappings) + * + * @param string $parent The project ID or project number from which the domain + * mappings should be listed. + * @param array $optParams Optional parameters. + * + * @opt_param string labelSelector Allows to filter resources based on a label. + * Supported operations are =, !=, exists, in, and notIn. + * @opt_param string resourceVersion The baseline resource version from which + * the list or watch operation should start. Not currently used by Cloud Run. + * @opt_param bool includeUninitialized Not currently used by Cloud Run. + * @opt_param string fieldSelector Allows to filter resources based on a + * specific value for a field name. Send this in a query string format. i.e. + * 'metadata.name%3Dlorem'. Not currently used by Cloud Run. + * @opt_param string continue Optional encoded string to continue paging. + * @opt_param int limit The maximum number of records that should be returned. + * @opt_param bool watch Flag that indicates that the client expects to watch + * this resource as well. Not currently used by Cloud Run. + * @return Google_Service_CloudRun_ListDomainMappingsResponse + */ + public function listNamespacesDomainmappings($parent, $optParams = array()) + { + $params = array('parent' => $parent); + $params = array_merge($params, $optParams); + return $this->call('list', array($params), "Google_Service_CloudRun_ListDomainMappingsResponse"); + } + /** + * Replace a domain mapping. + * + * Only the spec and metadata labels and annotations are modifiable. After the + * Update request, Cloud Run will work to make the 'status' match the requested + * 'spec'. + * + * May provide metadata.resourceVersion to enforce update from last read for + * optimistic concurrency control. (domainmappings.replaceDomainMapping) + * + * @param string $name The name of the domain mapping being retrieved. If + * needed, replace {namespace_id} with the project ID. + * @param Google_Service_CloudRun_DomainMapping $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_CloudRun_DomainMapping + */ + public function replaceDomainMapping($name, Google_Service_CloudRun_DomainMapping $postBody, $optParams = array()) + { + $params = array('name' => $name, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('replaceDomainMapping', array($params), "Google_Service_CloudRun_DomainMapping"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/NamespacesRevisions.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/NamespacesRevisions.php new file mode 100644 index 0000000..43095e2 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/NamespacesRevisions.php @@ -0,0 +1,90 @@ + + * $runService = new Google_Service_CloudRun(...); + * $revisions = $runService->revisions; + * + */ +class Google_Service_CloudRun_Resource_NamespacesRevisions extends Google_Service_Resource +{ + /** + * Delete a revision. (revisions.delete) + * + * @param string $name The name of the revision being deleted. If needed, + * replace {namespace_id} with the project ID. + * @param array $optParams Optional parameters. + * + * @opt_param string apiVersion Cloud Run currently ignores this parameter. + * @opt_param string propagationPolicy Specifies the propagation policy of + * delete. Cloud Run currently ignores this setting, and deletes in the + * background. Please see kubernetes.io/docs/concepts/workloads/controllers + * /garbage-collection/ for more information. + * @opt_param string kind Cloud Run currently ignores this parameter. + * @return Google_Service_CloudRun_Status + */ + public function delete($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('delete', array($params), "Google_Service_CloudRun_Status"); + } + /** + * Get information about a revision. (revisions.get) + * + * @param string $name The name of the revision being retrieved. If needed, + * replace {namespace_id} with the project ID. + * @param array $optParams Optional parameters. + * @return Google_Service_CloudRun_Revision + */ + public function get($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('get', array($params), "Google_Service_CloudRun_Revision"); + } + /** + * List revisions. (revisions.listNamespacesRevisions) + * + * @param string $parent The project ID or project number from which the + * revisions should be listed. + * @param array $optParams Optional parameters. + * + * @opt_param string labelSelector Allows to filter resources based on a label. + * Supported operations are =, !=, exists, in, and notIn. + * @opt_param string resourceVersion The baseline resource version from which + * the list or watch operation should start. Not currently used by Cloud Run. + * @opt_param bool includeUninitialized Not currently used by Cloud Run. + * @opt_param string fieldSelector Allows to filter resources based on a + * specific value for a field name. Send this in a query string format. i.e. + * 'metadata.name%3Dlorem'. Not currently used by Cloud Run. + * @opt_param string continue Optional encoded string to continue paging. + * @opt_param int limit The maximum number of records that should be returned. + * @opt_param bool watch Flag that indicates that the client expects to watch + * this resource as well. Not currently used by Cloud Run. + * @return Google_Service_CloudRun_ListRevisionsResponse + */ + public function listNamespacesRevisions($parent, $optParams = array()) + { + $params = array('parent' => $parent); + $params = array_merge($params, $optParams); + return $this->call('list', array($params), "Google_Service_CloudRun_ListRevisionsResponse"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/NamespacesRoutes.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/NamespacesRoutes.php new file mode 100644 index 0000000..d231e54 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/NamespacesRoutes.php @@ -0,0 +1,128 @@ + + * $runService = new Google_Service_CloudRun(...); + * $routes = $runService->routes; + * + */ +class Google_Service_CloudRun_Resource_NamespacesRoutes extends Google_Service_Resource +{ + /** + * Create a route. (routes.create) + * + * @param string $parent The project ID or project number in which this route + * should be created. + * @param Google_Service_CloudRun_Route $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_CloudRun_Route + */ + public function create($parent, Google_Service_CloudRun_Route $postBody, $optParams = array()) + { + $params = array('parent' => $parent, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('create', array($params), "Google_Service_CloudRun_Route"); + } + /** + * Delete a route. This will cause the route to stop serving traffic. + * (routes.delete) + * + * @param string $name The name of the route being deleted. If needed, replace + * {namespace_id} with the project ID. + * @param array $optParams Optional parameters. + * + * @opt_param string apiVersion Cloud Run currently ignores this parameter. + * @opt_param string propagationPolicy Specifies the propagation policy of + * delete. Cloud Run currently ignores this setting, and deletes in the + * background. Please see kubernetes.io/docs/concepts/workloads/controllers + * /garbage-collection/ for more information. + * @opt_param string kind Cloud Run currently ignores this parameter. + * @return Google_Service_CloudRun_Status + */ + public function delete($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('delete', array($params), "Google_Service_CloudRun_Status"); + } + /** + * Get information about a route. (routes.get) + * + * @param string $name The name of the route being retrieved. If needed, replace + * {namespace_id} with the project ID. + * @param array $optParams Optional parameters. + * @return Google_Service_CloudRun_Route + */ + public function get($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('get', array($params), "Google_Service_CloudRun_Route"); + } + /** + * List routes. (routes.listNamespacesRoutes) + * + * @param string $parent The project ID or project number from which the routes + * should be listed. + * @param array $optParams Optional parameters. + * + * @opt_param int limit The maximum number of records that should be returned. + * @opt_param bool watch Flag that indicates that the client expects to watch + * this resource as well. Not currently used by Cloud Run. + * @opt_param string labelSelector Allows to filter resources based on a label. + * Supported operations are =, !=, exists, in, and notIn. + * @opt_param string fieldSelector Allows to filter resources based on a + * specific value for a field name. Send this in a query string format. i.e. + * 'metadata.name%3Dlorem'. Not currently used by Cloud Run. + * @opt_param string resourceVersion The baseline resource version from which + * the list or watch operation should start. Not currently used by Cloud Run. + * @opt_param bool includeUninitialized Not currently used by Cloud Run. + * @opt_param string continue Optional encoded string to continue paging. + * @return Google_Service_CloudRun_ListRoutesResponse + */ + public function listNamespacesRoutes($parent, $optParams = array()) + { + $params = array('parent' => $parent); + $params = array_merge($params, $optParams); + return $this->call('list', array($params), "Google_Service_CloudRun_ListRoutesResponse"); + } + /** + * Replace a route. + * + * Only the spec and metadata labels and annotations are modifiable. After the + * Update request, Cloud Run will work to make the 'status' match the requested + * 'spec'. + * + * May provide metadata.resourceVersion to enforce update from last read for + * optimistic concurrency control. (routes.replaceRoute) + * + * @param string $name The name of the route being replaced. If needed, replace + * {namespace_id} with the project ID. + * @param Google_Service_CloudRun_Route $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_CloudRun_Route + */ + public function replaceRoute($name, Google_Service_CloudRun_Route $postBody, $optParams = array()) + { + $params = array('name' => $name, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('replaceRoute', array($params), "Google_Service_CloudRun_Route"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/NamespacesServices.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/NamespacesServices.php new file mode 100644 index 0000000..82de614 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/NamespacesServices.php @@ -0,0 +1,129 @@ + + * $runService = new Google_Service_CloudRun(...); + * $services = $runService->services; + * + */ +class Google_Service_CloudRun_Resource_NamespacesServices extends Google_Service_Resource +{ + /** + * Create a service. (services.create) + * + * @param string $parent The project ID or project number in which this service + * should be created. + * @param Google_Service_CloudRun_Service $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_CloudRun_Service + */ + public function create($parent, Google_Service_CloudRun_Service $postBody, $optParams = array()) + { + $params = array('parent' => $parent, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('create', array($params), "Google_Service_CloudRun_Service"); + } + /** + * Delete a service. This will cause the Service to stop serving traffic and + * will delete the child entities like Routes, Configurations and Revisions. + * (services.delete) + * + * @param string $name The name of the service being deleted. If needed, replace + * {namespace_id} with the project ID. + * @param array $optParams Optional parameters. + * + * @opt_param string propagationPolicy Specifies the propagation policy of + * delete. Cloud Run currently ignores this setting, and deletes in the + * background. Please see kubernetes.io/docs/concepts/workloads/controllers + * /garbage-collection/ for more information. + * @opt_param string kind Cloud Run currently ignores this parameter. + * @opt_param string apiVersion Cloud Run currently ignores this parameter. + * @return Google_Service_CloudRun_Status + */ + public function delete($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('delete', array($params), "Google_Service_CloudRun_Status"); + } + /** + * Get information about a service. (services.get) + * + * @param string $name The name of the service being retrieved. If needed, + * replace {namespace_id} with the project ID. + * @param array $optParams Optional parameters. + * @return Google_Service_CloudRun_Service + */ + public function get($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('get', array($params), "Google_Service_CloudRun_Service"); + } + /** + * List services. (services.listNamespacesServices) + * + * @param string $parent The project ID or project number from which the + * services should be listed. + * @param array $optParams Optional parameters. + * + * @opt_param string labelSelector Allows to filter resources based on a label. + * Supported operations are =, !=, exists, in, and notIn. + * @opt_param string resourceVersion The baseline resource version from which + * the list or watch operation should start. Not currently used by Cloud Run. + * @opt_param bool includeUninitialized Not currently used by Cloud Run. + * @opt_param string fieldSelector Allows to filter resources based on a + * specific value for a field name. Send this in a query string format. i.e. + * 'metadata.name%3Dlorem'. Not currently used by Cloud Run. + * @opt_param string continue Optional encoded string to continue paging. + * @opt_param int limit The maximum number of records that should be returned. + * @opt_param bool watch Flag that indicates that the client expects to watch + * this resource as well. Not currently used by Cloud Run. + * @return Google_Service_CloudRun_ListServicesResponse + */ + public function listNamespacesServices($parent, $optParams = array()) + { + $params = array('parent' => $parent); + $params = array_merge($params, $optParams); + return $this->call('list', array($params), "Google_Service_CloudRun_ListServicesResponse"); + } + /** + * Replace a service. + * + * Only the spec and metadata labels and annotations are modifiable. After the + * Update request, Cloud Run will work to make the 'status' match the requested + * 'spec'. + * + * May provide metadata.resourceVersion to enforce update from last read for + * optimistic concurrency control. (services.replaceService) + * + * @param string $name The name of the service being replaced. If needed, + * replace {namespace_id} with the project ID. + * @param Google_Service_CloudRun_Service $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_CloudRun_Service + */ + public function replaceService($name, Google_Service_CloudRun_Service $postBody, $optParams = array()) + { + $params = array('name' => $name, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('replaceService', array($params), "Google_Service_CloudRun_Service"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/ProjectsLocations.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/ProjectsLocations.php index 71fc9f8..4d97b4d 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/ProjectsLocations.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/ProjectsLocations.php @@ -46,9 +46,9 @@ class Google_Service_CloudRun_Resource_ProjectsLocations extends Google_Service_ * applicable. * @param array $optParams Optional parameters. * - * @opt_param string filter The standard list filter. * @opt_param string pageToken The standard list page token. * @opt_param int pageSize The standard list page size. + * @opt_param string filter The standard list filter. * @return Google_Service_CloudRun_ListLocationsResponse */ public function listProjectsLocations($name, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/ProjectsLocationsAuthorizeddomains.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/ProjectsLocationsAuthorizeddomains.php new file mode 100644 index 0000000..b50fd55 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/ProjectsLocationsAuthorizeddomains.php @@ -0,0 +1,47 @@ + + * $runService = new Google_Service_CloudRun(...); + * $authorizeddomains = $runService->authorizeddomains; + * + */ +class Google_Service_CloudRun_Resource_ProjectsLocationsAuthorizeddomains extends Google_Service_Resource +{ + /** + * List authorized domains. + * (authorizeddomains.listProjectsLocationsAuthorizeddomains) + * + * @param string $parent Name of the parent Application resource. Example: + * `apps/myapp`. + * @param array $optParams Optional parameters. + * + * @opt_param string pageToken Continuation token for fetching the next page of + * results. + * @opt_param int pageSize Maximum results to return per page. + * @return Google_Service_CloudRun_ListAuthorizedDomainsResponse + */ + public function listProjectsLocationsAuthorizeddomains($parent, $optParams = array()) + { + $params = array('parent' => $parent); + $params = array_merge($params, $optParams); + return $this->call('list', array($params), "Google_Service_CloudRun_ListAuthorizedDomainsResponse"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/ProjectsLocationsAutodomainmappings.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/ProjectsLocationsAutodomainmappings.php new file mode 100644 index 0000000..dac31fd --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/ProjectsLocationsAutodomainmappings.php @@ -0,0 +1,128 @@ + + * $runService = new Google_Service_CloudRun(...); + * $autodomainmappings = $runService->autodomainmappings; + * + */ +class Google_Service_CloudRun_Resource_ProjectsLocationsAutodomainmappings extends Google_Service_Resource +{ + /** + * Creates a new auto domain mapping. (autodomainmappings.create) + * + * @param string $parent The project ID or project number in which this auto + * domain mapping should be created. + * @param Google_Service_CloudRun_AutoDomainMapping $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_CloudRun_AutoDomainMapping + */ + public function create($parent, Google_Service_CloudRun_AutoDomainMapping $postBody, $optParams = array()) + { + $params = array('parent' => $parent, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('create', array($params), "Google_Service_CloudRun_AutoDomainMapping"); + } + /** + * Delete an auto domain mapping. (autodomainmappings.delete) + * + * @param string $name The name of the auto domain mapping being deleted. If + * needed, replace {namespace_id} with the project ID. + * @param array $optParams Optional parameters. + * + * @opt_param string propagationPolicy Specifies the propagation policy of + * delete. Cloud Run currently ignores this setting, and deletes in the + * background. Please see kubernetes.io/docs/concepts/workloads/controllers + * /garbage-collection/ for more information. + * @opt_param string kind Cloud Run currently ignores this parameter. + * @opt_param string apiVersion Cloud Run currently ignores this parameter. + * @return Google_Service_CloudRun_Status + */ + public function delete($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('delete', array($params), "Google_Service_CloudRun_Status"); + } + /** + * Get information about an auto domain mapping. (autodomainmappings.get) + * + * @param string $name The name of the auto domain mapping being retrieved. If + * needed, replace {namespace_id} with the project ID. + * @param array $optParams Optional parameters. + * @return Google_Service_CloudRun_AutoDomainMapping + */ + public function get($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('get', array($params), "Google_Service_CloudRun_AutoDomainMapping"); + } + /** + * List auto domain mappings. + * (autodomainmappings.listProjectsLocationsAutodomainmappings) + * + * @param string $parent The project ID or project number from which the auto + * domain mappings should be listed. + * @param array $optParams Optional parameters. + * + * @opt_param string fieldSelector Allows to filter resources based on a + * specific value for a field name. Send this in a query string format. i.e. + * 'metadata.name%3Dlorem'. Not currently used by Cloud Run. + * @opt_param string resourceVersion The baseline resource version from which + * the list or watch operation should start. Not currently used by Cloud Run. + * @opt_param bool includeUninitialized Not currently used by Cloud Run. + * @opt_param string continue Optional encoded string to continue paging. + * @opt_param int limit The maximum number of records that should be returned. + * @opt_param bool watch Flag that indicates that the client expects to watch + * this resource as well. Not currently used by Cloud Run. + * @opt_param string labelSelector Allows to filter resources based on a label. + * Supported operations are =, !=, exists, in, and notIn. + * @return Google_Service_CloudRun_ListAutoDomainMappingsResponse + */ + public function listProjectsLocationsAutodomainmappings($parent, $optParams = array()) + { + $params = array('parent' => $parent); + $params = array_merge($params, $optParams); + return $this->call('list', array($params), "Google_Service_CloudRun_ListAutoDomainMappingsResponse"); + } + /** + * Replace an auto domain mapping. + * + * Only the spec and metadata labels and annotations are modifiable. After the + * Update request, Cloud Run will work to make the 'status' match the requested + * 'spec'. + * + * May provide metadata.resourceVersion to enforce update from last read for + * optimistic concurrency control. (autodomainmappings.replaceAutoDomainMapping) + * + * @param string $name The name of the auto domain mapping being retrieved. If + * needed, replace {namespace_id} with the project ID. + * @param Google_Service_CloudRun_AutoDomainMapping $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_CloudRun_AutoDomainMapping + */ + public function replaceAutoDomainMapping($name, Google_Service_CloudRun_AutoDomainMapping $postBody, $optParams = array()) + { + $params = array('name' => $name, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('replaceAutoDomainMapping', array($params), "Google_Service_CloudRun_AutoDomainMapping"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/ProjectsLocationsConfigurations.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/ProjectsLocationsConfigurations.php new file mode 100644 index 0000000..8fcdd0a --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/ProjectsLocationsConfigurations.php @@ -0,0 +1,129 @@ + + * $runService = new Google_Service_CloudRun(...); + * $configurations = $runService->configurations; + * + */ +class Google_Service_CloudRun_Resource_ProjectsLocationsConfigurations extends Google_Service_Resource +{ + /** + * Create a configuration. (configurations.create) + * + * @param string $parent The project ID or project number in which this + * configuration should be created. + * @param Google_Service_CloudRun_Configuration $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_CloudRun_Configuration + */ + public function create($parent, Google_Service_CloudRun_Configuration $postBody, $optParams = array()) + { + $params = array('parent' => $parent, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('create', array($params), "Google_Service_CloudRun_Configuration"); + } + /** + * delete a configuration. This will cause the configuration to delete all child + * revisions. Prior to calling this, any route referencing the configuration (or + * revision from the configuration) must be deleted. (configurations.delete) + * + * @param string $name The name of the configuration being deleted. If needed, + * replace {namespace_id} with the project ID. + * @param array $optParams Optional parameters. + * + * @opt_param string apiVersion Cloud Run currently ignores this parameter. + * @opt_param string propagationPolicy Specifies the propagation policy of + * delete. Cloud Run currently ignores this setting, and deletes in the + * background. Please see kubernetes.io/docs/concepts/workloads/controllers + * /garbage-collection/ for more information. + * @opt_param string kind Cloud Run currently ignores this parameter. + * @return Google_Service_CloudRun_Status + */ + public function delete($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('delete', array($params), "Google_Service_CloudRun_Status"); + } + /** + * Get information about a configuration. (configurations.get) + * + * @param string $name The name of the configuration being retrieved. If needed, + * replace {namespace_id} with the project ID. + * @param array $optParams Optional parameters. + * @return Google_Service_CloudRun_Configuration + */ + public function get($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('get', array($params), "Google_Service_CloudRun_Configuration"); + } + /** + * List configurations. (configurations.listProjectsLocationsConfigurations) + * + * @param string $parent The project ID or project number from which the + * configurations should be listed. + * @param array $optParams Optional parameters. + * + * @opt_param string labelSelector Allows to filter resources based on a label. + * Supported operations are =, !=, exists, in, and notIn. + * @opt_param string resourceVersion The baseline resource version from which + * the list or watch operation should start. Not currently used by Cloud Run. + * @opt_param bool includeUninitialized Not currently used by Cloud Run. + * @opt_param string fieldSelector Allows to filter resources based on a + * specific value for a field name. Send this in a query string format. i.e. + * 'metadata.name%3Dlorem'. Not currently used by Cloud Run. + * @opt_param string continue Optional encoded string to continue paging. + * @opt_param int limit The maximum number of records that should be returned. + * @opt_param bool watch Flag that indicates that the client expects to watch + * this resource as well. Not currently used by Cloud Run. + * @return Google_Service_CloudRun_ListConfigurationsResponse + */ + public function listProjectsLocationsConfigurations($parent, $optParams = array()) + { + $params = array('parent' => $parent); + $params = array_merge($params, $optParams); + return $this->call('list', array($params), "Google_Service_CloudRun_ListConfigurationsResponse"); + } + /** + * Replace a configuration. + * + * Only the spec and metadata labels and annotations are modifiable. After the + * Update request, Cloud Run will work to make the 'status' match the requested + * 'spec'. + * + * May provide metadata.resourceVersion to enforce update from last read for + * optimistic concurrency control. (configurations.replaceConfiguration) + * + * @param string $name The name of the configuration being retrieved. If needed, + * replace {namespace_id} with the project ID. + * @param Google_Service_CloudRun_Configuration $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_CloudRun_Configuration + */ + public function replaceConfiguration($name, Google_Service_CloudRun_Configuration $postBody, $optParams = array()) + { + $params = array('name' => $name, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('replaceConfiguration', array($params), "Google_Service_CloudRun_Configuration"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/ProjectsLocationsDomainmappings.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/ProjectsLocationsDomainmappings.php new file mode 100644 index 0000000..40a440f --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/ProjectsLocationsDomainmappings.php @@ -0,0 +1,127 @@ + + * $runService = new Google_Service_CloudRun(...); + * $domainmappings = $runService->domainmappings; + * + */ +class Google_Service_CloudRun_Resource_ProjectsLocationsDomainmappings extends Google_Service_Resource +{ + /** + * Create a new domain mapping. (domainmappings.create) + * + * @param string $parent The project ID or project number in which this domain + * mapping should be created. + * @param Google_Service_CloudRun_DomainMapping $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_CloudRun_DomainMapping + */ + public function create($parent, Google_Service_CloudRun_DomainMapping $postBody, $optParams = array()) + { + $params = array('parent' => $parent, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('create', array($params), "Google_Service_CloudRun_DomainMapping"); + } + /** + * Delete a domain mapping. (domainmappings.delete) + * + * @param string $name The name of the domain mapping being deleted. If needed, + * replace {namespace_id} with the project ID. + * @param array $optParams Optional parameters. + * + * @opt_param string apiVersion Cloud Run currently ignores this parameter. + * @opt_param string propagationPolicy Specifies the propagation policy of + * delete. Cloud Run currently ignores this setting, and deletes in the + * background. Please see kubernetes.io/docs/concepts/workloads/controllers + * /garbage-collection/ for more information. + * @opt_param string kind Cloud Run currently ignores this parameter. + * @return Google_Service_CloudRun_Status + */ + public function delete($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('delete', array($params), "Google_Service_CloudRun_Status"); + } + /** + * Get information about a domain mapping. (domainmappings.get) + * + * @param string $name The name of the domain mapping being retrieved. If + * needed, replace {namespace_id} with the project ID. + * @param array $optParams Optional parameters. + * @return Google_Service_CloudRun_DomainMapping + */ + public function get($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('get', array($params), "Google_Service_CloudRun_DomainMapping"); + } + /** + * List domain mappings. (domainmappings.listProjectsLocationsDomainmappings) + * + * @param string $parent The project ID or project number from which the domain + * mappings should be listed. + * @param array $optParams Optional parameters. + * + * @opt_param string labelSelector Allows to filter resources based on a label. + * Supported operations are =, !=, exists, in, and notIn. + * @opt_param string fieldSelector Allows to filter resources based on a + * specific value for a field name. Send this in a query string format. i.e. + * 'metadata.name%3Dlorem'. Not currently used by Cloud Run. + * @opt_param bool includeUninitialized Not currently used by Cloud Run. + * @opt_param string resourceVersion The baseline resource version from which + * the list or watch operation should start. Not currently used by Cloud Run. + * @opt_param string continue Optional encoded string to continue paging. + * @opt_param int limit The maximum number of records that should be returned. + * @opt_param bool watch Flag that indicates that the client expects to watch + * this resource as well. Not currently used by Cloud Run. + * @return Google_Service_CloudRun_ListDomainMappingsResponse + */ + public function listProjectsLocationsDomainmappings($parent, $optParams = array()) + { + $params = array('parent' => $parent); + $params = array_merge($params, $optParams); + return $this->call('list', array($params), "Google_Service_CloudRun_ListDomainMappingsResponse"); + } + /** + * Replace a domain mapping. + * + * Only the spec and metadata labels and annotations are modifiable. After the + * Update request, Cloud Run will work to make the 'status' match the requested + * 'spec'. + * + * May provide metadata.resourceVersion to enforce update from last read for + * optimistic concurrency control. (domainmappings.replaceDomainMapping) + * + * @param string $name The name of the domain mapping being retrieved. If + * needed, replace {namespace_id} with the project ID. + * @param Google_Service_CloudRun_DomainMapping $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_CloudRun_DomainMapping + */ + public function replaceDomainMapping($name, Google_Service_CloudRun_DomainMapping $postBody, $optParams = array()) + { + $params = array('name' => $name, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('replaceDomainMapping', array($params), "Google_Service_CloudRun_DomainMapping"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/ProjectsLocationsRevisions.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/ProjectsLocationsRevisions.php new file mode 100644 index 0000000..9de4ab2 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/ProjectsLocationsRevisions.php @@ -0,0 +1,90 @@ + + * $runService = new Google_Service_CloudRun(...); + * $revisions = $runService->revisions; + * + */ +class Google_Service_CloudRun_Resource_ProjectsLocationsRevisions extends Google_Service_Resource +{ + /** + * Delete a revision. (revisions.delete) + * + * @param string $name The name of the revision being deleted. If needed, + * replace {namespace_id} with the project ID. + * @param array $optParams Optional parameters. + * + * @opt_param string apiVersion Cloud Run currently ignores this parameter. + * @opt_param string propagationPolicy Specifies the propagation policy of + * delete. Cloud Run currently ignores this setting, and deletes in the + * background. Please see kubernetes.io/docs/concepts/workloads/controllers + * /garbage-collection/ for more information. + * @opt_param string kind Cloud Run currently ignores this parameter. + * @return Google_Service_CloudRun_Status + */ + public function delete($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('delete', array($params), "Google_Service_CloudRun_Status"); + } + /** + * Get information about a revision. (revisions.get) + * + * @param string $name The name of the revision being retrieved. If needed, + * replace {namespace_id} with the project ID. + * @param array $optParams Optional parameters. + * @return Google_Service_CloudRun_Revision + */ + public function get($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('get', array($params), "Google_Service_CloudRun_Revision"); + } + /** + * List revisions. (revisions.listProjectsLocationsRevisions) + * + * @param string $parent The project ID or project number from which the + * revisions should be listed. + * @param array $optParams Optional parameters. + * + * @opt_param bool watch Flag that indicates that the client expects to watch + * this resource as well. Not currently used by Cloud Run. + * @opt_param string labelSelector Allows to filter resources based on a label. + * Supported operations are =, !=, exists, in, and notIn. + * @opt_param string resourceVersion The baseline resource version from which + * the list or watch operation should start. Not currently used by Cloud Run. + * @opt_param bool includeUninitialized Not currently used by Cloud Run. + * @opt_param string fieldSelector Allows to filter resources based on a + * specific value for a field name. Send this in a query string format. i.e. + * 'metadata.name%3Dlorem'. Not currently used by Cloud Run. + * @opt_param string continue Optional encoded string to continue paging. + * @opt_param int limit The maximum number of records that should be returned. + * @return Google_Service_CloudRun_ListRevisionsResponse + */ + public function listProjectsLocationsRevisions($parent, $optParams = array()) + { + $params = array('parent' => $parent); + $params = array_merge($params, $optParams); + return $this->call('list', array($params), "Google_Service_CloudRun_ListRevisionsResponse"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/ProjectsLocationsRoutes.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/ProjectsLocationsRoutes.php new file mode 100644 index 0000000..e890bec --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/ProjectsLocationsRoutes.php @@ -0,0 +1,128 @@ + + * $runService = new Google_Service_CloudRun(...); + * $routes = $runService->routes; + * + */ +class Google_Service_CloudRun_Resource_ProjectsLocationsRoutes extends Google_Service_Resource +{ + /** + * Create a route. (routes.create) + * + * @param string $parent The project ID or project number in which this route + * should be created. + * @param Google_Service_CloudRun_Route $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_CloudRun_Route + */ + public function create($parent, Google_Service_CloudRun_Route $postBody, $optParams = array()) + { + $params = array('parent' => $parent, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('create', array($params), "Google_Service_CloudRun_Route"); + } + /** + * Delete a route. This will cause the route to stop serving traffic. + * (routes.delete) + * + * @param string $name The name of the route being deleted. If needed, replace + * {namespace_id} with the project ID. + * @param array $optParams Optional parameters. + * + * @opt_param string apiVersion Cloud Run currently ignores this parameter. + * @opt_param string propagationPolicy Specifies the propagation policy of + * delete. Cloud Run currently ignores this setting, and deletes in the + * background. Please see kubernetes.io/docs/concepts/workloads/controllers + * /garbage-collection/ for more information. + * @opt_param string kind Cloud Run currently ignores this parameter. + * @return Google_Service_CloudRun_Status + */ + public function delete($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('delete', array($params), "Google_Service_CloudRun_Status"); + } + /** + * Get information about a route. (routes.get) + * + * @param string $name The name of the route being retrieved. If needed, replace + * {namespace_id} with the project ID. + * @param array $optParams Optional parameters. + * @return Google_Service_CloudRun_Route + */ + public function get($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('get', array($params), "Google_Service_CloudRun_Route"); + } + /** + * List routes. (routes.listProjectsLocationsRoutes) + * + * @param string $parent The project ID or project number from which the routes + * should be listed. + * @param array $optParams Optional parameters. + * + * @opt_param string continue Optional encoded string to continue paging. + * @opt_param int limit The maximum number of records that should be returned. + * @opt_param bool watch Flag that indicates that the client expects to watch + * this resource as well. Not currently used by Cloud Run. + * @opt_param string labelSelector Allows to filter resources based on a label. + * Supported operations are =, !=, exists, in, and notIn. + * @opt_param string resourceVersion The baseline resource version from which + * the list or watch operation should start. Not currently used by Cloud Run. + * @opt_param bool includeUninitialized Not currently used by Cloud Run. + * @opt_param string fieldSelector Allows to filter resources based on a + * specific value for a field name. Send this in a query string format. i.e. + * 'metadata.name%3Dlorem'. Not currently used by Cloud Run. + * @return Google_Service_CloudRun_ListRoutesResponse + */ + public function listProjectsLocationsRoutes($parent, $optParams = array()) + { + $params = array('parent' => $parent); + $params = array_merge($params, $optParams); + return $this->call('list', array($params), "Google_Service_CloudRun_ListRoutesResponse"); + } + /** + * Replace a route. + * + * Only the spec and metadata labels and annotations are modifiable. After the + * Update request, Cloud Run will work to make the 'status' match the requested + * 'spec'. + * + * May provide metadata.resourceVersion to enforce update from last read for + * optimistic concurrency control. (routes.replaceRoute) + * + * @param string $name The name of the route being replaced. If needed, replace + * {namespace_id} with the project ID. + * @param Google_Service_CloudRun_Route $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_CloudRun_Route + */ + public function replaceRoute($name, Google_Service_CloudRun_Route $postBody, $optParams = array()) + { + $params = array('name' => $name, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('replaceRoute', array($params), "Google_Service_CloudRun_Route"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/ProjectsLocationsServices.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/ProjectsLocationsServices.php new file mode 100644 index 0000000..bfa648a --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Resource/ProjectsLocationsServices.php @@ -0,0 +1,192 @@ + + * $runService = new Google_Service_CloudRun(...); + * $services = $runService->services; + * + */ +class Google_Service_CloudRun_Resource_ProjectsLocationsServices extends Google_Service_Resource +{ + /** + * Create a service. (services.create) + * + * @param string $parent The project ID or project number in which this service + * should be created. + * @param Google_Service_CloudRun_Service $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_CloudRun_Service + */ + public function create($parent, Google_Service_CloudRun_Service $postBody, $optParams = array()) + { + $params = array('parent' => $parent, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('create', array($params), "Google_Service_CloudRun_Service"); + } + /** + * Delete a service. This will cause the Service to stop serving traffic and + * will delete the child entities like Routes, Configurations and Revisions. + * (services.delete) + * + * @param string $name The name of the service being deleted. If needed, replace + * {namespace_id} with the project ID. + * @param array $optParams Optional parameters. + * + * @opt_param string apiVersion Cloud Run currently ignores this parameter. + * @opt_param string propagationPolicy Specifies the propagation policy of + * delete. Cloud Run currently ignores this setting, and deletes in the + * background. Please see kubernetes.io/docs/concepts/workloads/controllers + * /garbage-collection/ for more information. + * @opt_param string kind Cloud Run currently ignores this parameter. + * @return Google_Service_CloudRun_Status + */ + public function delete($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('delete', array($params), "Google_Service_CloudRun_Status"); + } + /** + * Get information about a service. (services.get) + * + * @param string $name The name of the service being retrieved. If needed, + * replace {namespace_id} with the project ID. + * @param array $optParams Optional parameters. + * @return Google_Service_CloudRun_Service + */ + public function get($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('get', array($params), "Google_Service_CloudRun_Service"); + } + /** + * Get the IAM Access Control policy currently in effect for the given Cloud Run + * service. This result does not include any inherited policies. + * (services.getIamPolicy) + * + * @param string $resource REQUIRED: The resource for which the policy is being + * requested. See the operation documentation for the appropriate value for this + * field. + * @param array $optParams Optional parameters. + * + * @opt_param int options.requestedPolicyVersion Optional. The policy format + * version to be returned. + * + * Valid values are 0, 1, and 3. Requests specifying an invalid value will be + * rejected. + * + * Requests for policies with any conditional bindings must specify version 3. + * Policies without any conditional bindings may specify any valid value or + * leave the field unset. + * @return Google_Service_CloudRun_Policy + */ + public function getIamPolicy($resource, $optParams = array()) + { + $params = array('resource' => $resource); + $params = array_merge($params, $optParams); + return $this->call('getIamPolicy', array($params), "Google_Service_CloudRun_Policy"); + } + /** + * List services. (services.listProjectsLocationsServices) + * + * @param string $parent The project ID or project number from which the + * services should be listed. + * @param array $optParams Optional parameters. + * + * @opt_param string labelSelector Allows to filter resources based on a label. + * Supported operations are =, !=, exists, in, and notIn. + * @opt_param string resourceVersion The baseline resource version from which + * the list or watch operation should start. Not currently used by Cloud Run. + * @opt_param bool includeUninitialized Not currently used by Cloud Run. + * @opt_param string fieldSelector Allows to filter resources based on a + * specific value for a field name. Send this in a query string format. i.e. + * 'metadata.name%3Dlorem'. Not currently used by Cloud Run. + * @opt_param string continue Optional encoded string to continue paging. + * @opt_param int limit The maximum number of records that should be returned. + * @opt_param bool watch Flag that indicates that the client expects to watch + * this resource as well. Not currently used by Cloud Run. + * @return Google_Service_CloudRun_ListServicesResponse + */ + public function listProjectsLocationsServices($parent, $optParams = array()) + { + $params = array('parent' => $parent); + $params = array_merge($params, $optParams); + return $this->call('list', array($params), "Google_Service_CloudRun_ListServicesResponse"); + } + /** + * Replace a service. + * + * Only the spec and metadata labels and annotations are modifiable. After the + * Update request, Cloud Run will work to make the 'status' match the requested + * 'spec'. + * + * May provide metadata.resourceVersion to enforce update from last read for + * optimistic concurrency control. (services.replaceService) + * + * @param string $name The name of the service being replaced. If needed, + * replace {namespace_id} with the project ID. + * @param Google_Service_CloudRun_Service $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_CloudRun_Service + */ + public function replaceService($name, Google_Service_CloudRun_Service $postBody, $optParams = array()) + { + $params = array('name' => $name, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('replaceService', array($params), "Google_Service_CloudRun_Service"); + } + /** + * Sets the IAM Access control policy for the specified Service. Overwrites any + * existing policy. (services.setIamPolicy) + * + * @param string $resource REQUIRED: The resource for which the policy is being + * specified. See the operation documentation for the appropriate value for this + * field. + * @param Google_Service_CloudRun_SetIamPolicyRequest $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_CloudRun_Policy + */ + public function setIamPolicy($resource, Google_Service_CloudRun_SetIamPolicyRequest $postBody, $optParams = array()) + { + $params = array('resource' => $resource, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('setIamPolicy', array($params), "Google_Service_CloudRun_Policy"); + } + /** + * Returns permissions that a caller has on the specified Project. + * + * There are no permissions required for making this API call. + * (services.testIamPermissions) + * + * @param string $resource REQUIRED: The resource for which the policy detail is + * being requested. See the operation documentation for the appropriate value + * for this field. + * @param Google_Service_CloudRun_TestIamPermissionsRequest $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_CloudRun_TestIamPermissionsResponse + */ + public function testIamPermissions($resource, Google_Service_CloudRun_TestIamPermissionsRequest $postBody, $optParams = array()) + { + $params = array('resource' => $resource, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('testIamPermissions', array($params), "Google_Service_CloudRun_TestIamPermissionsResponse"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1TextAnnotationDetectedBreak.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ResourceRecord.php similarity index 68% rename from vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1TextAnnotationDetectedBreak.php rename to vendor/google/apiclient-services/src/Google/Service/CloudRun/ResourceRecord.php index 7ad37e9..cfed608 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1TextAnnotationDetectedBreak.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ResourceRecord.php @@ -15,18 +15,27 @@ * the License. */ -class Google_Service_Vision_GoogleCloudVisionV1p5beta1TextAnnotationDetectedBreak extends Google_Model +class Google_Service_CloudRun_ResourceRecord extends Google_Model { - public $isPrefix; + public $name; + public $rrdata; public $type; - public function setIsPrefix($isPrefix) + public function setName($name) { - $this->isPrefix = $isPrefix; + $this->name = $name; } - public function getIsPrefix() + public function getName() { - return $this->isPrefix; + return $this->name; + } + public function setRrdata($rrdata) + { + $this->rrdata = $rrdata; + } + public function getRrdata() + { + return $this->rrdata; } public function setType($type) { diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/ResourceRequirements.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ResourceRequirements.php new file mode 100644 index 0000000..d28fd2b --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ResourceRequirements.php @@ -0,0 +1,39 @@ +limits = $limits; + } + public function getLimits() + { + return $this->limits; + } + public function setRequests($requests) + { + $this->requests = $requests; + } + public function getRequests() + { + return $this->requests; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/Revision.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Revision.php new file mode 100644 index 0000000..21f42b9 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Revision.php @@ -0,0 +1,87 @@ +apiVersion = $apiVersion; + } + public function getApiVersion() + { + return $this->apiVersion; + } + public function setKind($kind) + { + $this->kind = $kind; + } + public function getKind() + { + return $this->kind; + } + /** + * @param Google_Service_CloudRun_ObjectMeta + */ + public function setMetadata(Google_Service_CloudRun_ObjectMeta $metadata) + { + $this->metadata = $metadata; + } + /** + * @return Google_Service_CloudRun_ObjectMeta + */ + public function getMetadata() + { + return $this->metadata; + } + /** + * @param Google_Service_CloudRun_RevisionSpec + */ + public function setSpec(Google_Service_CloudRun_RevisionSpec $spec) + { + $this->spec = $spec; + } + /** + * @return Google_Service_CloudRun_RevisionSpec + */ + public function getSpec() + { + return $this->spec; + } + /** + * @param Google_Service_CloudRun_RevisionStatus + */ + public function setStatus(Google_Service_CloudRun_RevisionStatus $status) + { + $this->status = $status; + } + /** + * @return Google_Service_CloudRun_RevisionStatus + */ + public function getStatus() + { + return $this->status; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/RevisionSpec.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/RevisionSpec.php new file mode 100644 index 0000000..058a448 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/RevisionSpec.php @@ -0,0 +1,81 @@ +containerConcurrency = $containerConcurrency; + } + public function getContainerConcurrency() + { + return $this->containerConcurrency; + } + /** + * @param Google_Service_CloudRun_Container + */ + public function setContainers($containers) + { + $this->containers = $containers; + } + /** + * @return Google_Service_CloudRun_Container + */ + public function getContainers() + { + return $this->containers; + } + public function setServiceAccountName($serviceAccountName) + { + $this->serviceAccountName = $serviceAccountName; + } + public function getServiceAccountName() + { + return $this->serviceAccountName; + } + public function setTimeoutSeconds($timeoutSeconds) + { + $this->timeoutSeconds = $timeoutSeconds; + } + public function getTimeoutSeconds() + { + return $this->timeoutSeconds; + } + /** + * @param Google_Service_CloudRun_Volume + */ + public function setVolumes($volumes) + { + $this->volumes = $volumes; + } + /** + * @return Google_Service_CloudRun_Volume + */ + public function getVolumes() + { + return $this->volumes; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/RevisionStatus.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/RevisionStatus.php new file mode 100644 index 0000000..57e214a --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/RevisionStatus.php @@ -0,0 +1,74 @@ +conditions = $conditions; + } + /** + * @return Google_Service_CloudRun_GoogleCloudRunV1Condition + */ + public function getConditions() + { + return $this->conditions; + } + public function setImageDigest($imageDigest) + { + $this->imageDigest = $imageDigest; + } + public function getImageDigest() + { + return $this->imageDigest; + } + public function setLogUrl($logUrl) + { + $this->logUrl = $logUrl; + } + public function getLogUrl() + { + return $this->logUrl; + } + public function setObservedGeneration($observedGeneration) + { + $this->observedGeneration = $observedGeneration; + } + public function getObservedGeneration() + { + return $this->observedGeneration; + } + public function setServiceName($serviceName) + { + $this->serviceName = $serviceName; + } + public function getServiceName() + { + return $this->serviceName; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/RevisionTemplate.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/RevisionTemplate.php new file mode 100644 index 0000000..c45218a --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/RevisionTemplate.php @@ -0,0 +1,53 @@ +metadata = $metadata; + } + /** + * @return Google_Service_CloudRun_ObjectMeta + */ + public function getMetadata() + { + return $this->metadata; + } + /** + * @param Google_Service_CloudRun_RevisionSpec + */ + public function setSpec(Google_Service_CloudRun_RevisionSpec $spec) + { + $this->spec = $spec; + } + /** + * @return Google_Service_CloudRun_RevisionSpec + */ + public function getSpec() + { + return $this->spec; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/Route.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Route.php new file mode 100644 index 0000000..0f391d6 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Route.php @@ -0,0 +1,87 @@ +apiVersion = $apiVersion; + } + public function getApiVersion() + { + return $this->apiVersion; + } + public function setKind($kind) + { + $this->kind = $kind; + } + public function getKind() + { + return $this->kind; + } + /** + * @param Google_Service_CloudRun_ObjectMeta + */ + public function setMetadata(Google_Service_CloudRun_ObjectMeta $metadata) + { + $this->metadata = $metadata; + } + /** + * @return Google_Service_CloudRun_ObjectMeta + */ + public function getMetadata() + { + return $this->metadata; + } + /** + * @param Google_Service_CloudRun_RouteSpec + */ + public function setSpec(Google_Service_CloudRun_RouteSpec $spec) + { + $this->spec = $spec; + } + /** + * @return Google_Service_CloudRun_RouteSpec + */ + public function getSpec() + { + return $this->spec; + } + /** + * @param Google_Service_CloudRun_RouteStatus + */ + public function setStatus(Google_Service_CloudRun_RouteStatus $status) + { + $this->status = $status; + } + /** + * @return Google_Service_CloudRun_RouteStatus + */ + public function getStatus() + { + return $this->status; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Detail.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/RouteSpec.php similarity index 58% rename from vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Detail.php rename to vendor/google/apiclient-services/src/Google/Service/CloudRun/RouteSpec.php index daf63dd..b9cf3c2 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Detail.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/RouteSpec.php @@ -15,24 +15,24 @@ * the License. */ -class Google_Service_CloudHealthcare_Detail extends Google_Collection +class Google_Service_CloudRun_RouteSpec extends Google_Collection { - protected $collection_key = 'findings'; - protected $findingsType = 'Google_Service_CloudHealthcare_Finding'; - protected $findingsDataType = 'array'; + protected $collection_key = 'traffic'; + protected $trafficType = 'Google_Service_CloudRun_TrafficTarget'; + protected $trafficDataType = 'array'; /** - * @param Google_Service_CloudHealthcare_Finding + * @param Google_Service_CloudRun_TrafficTarget */ - public function setFindings($findings) + public function setTraffic($traffic) { - $this->findings = $findings; + $this->traffic = $traffic; } /** - * @return Google_Service_CloudHealthcare_Finding + * @return Google_Service_CloudRun_TrafficTarget */ - public function getFindings() + public function getTraffic() { - return $this->findings; + return $this->traffic; } } diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/RouteStatus.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/RouteStatus.php new file mode 100644 index 0000000..aef5055 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/RouteStatus.php @@ -0,0 +1,88 @@ +address = $address; + } + /** + * @return Google_Service_CloudRun_Addressable + */ + public function getAddress() + { + return $this->address; + } + /** + * @param Google_Service_CloudRun_GoogleCloudRunV1Condition + */ + public function setConditions($conditions) + { + $this->conditions = $conditions; + } + /** + * @return Google_Service_CloudRun_GoogleCloudRunV1Condition + */ + public function getConditions() + { + return $this->conditions; + } + public function setObservedGeneration($observedGeneration) + { + $this->observedGeneration = $observedGeneration; + } + public function getObservedGeneration() + { + return $this->observedGeneration; + } + /** + * @param Google_Service_CloudRun_TrafficTarget + */ + public function setTraffic($traffic) + { + $this->traffic = $traffic; + } + /** + * @return Google_Service_CloudRun_TrafficTarget + */ + public function getTraffic() + { + return $this->traffic; + } + public function setUrl($url) + { + $this->url = $url; + } + public function getUrl() + { + return $this->url; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1ReferenceImage.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/SecretEnvSource.php similarity index 52% rename from vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1ReferenceImage.php rename to vendor/google/apiclient-services/src/Google/Service/CloudRun/SecretEnvSource.php index 775a62a..9722c0e 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1ReferenceImage.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/SecretEnvSource.php @@ -15,27 +15,26 @@ * the License. */ -class Google_Service_Vision_GoogleCloudVisionV1p5beta1ReferenceImage extends Google_Collection +class Google_Service_CloudRun_SecretEnvSource extends Google_Model { - protected $collection_key = 'boundingPolys'; - protected $boundingPolysType = 'Google_Service_Vision_GoogleCloudVisionV1p5beta1BoundingPoly'; - protected $boundingPolysDataType = 'array'; + protected $localObjectReferenceType = 'Google_Service_CloudRun_LocalObjectReference'; + protected $localObjectReferenceDataType = ''; public $name; - public $uri; + public $optional; /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1BoundingPoly + * @param Google_Service_CloudRun_LocalObjectReference */ - public function setBoundingPolys($boundingPolys) + public function setLocalObjectReference(Google_Service_CloudRun_LocalObjectReference $localObjectReference) { - $this->boundingPolys = $boundingPolys; + $this->localObjectReference = $localObjectReference; } /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1BoundingPoly + * @return Google_Service_CloudRun_LocalObjectReference */ - public function getBoundingPolys() + public function getLocalObjectReference() { - return $this->boundingPolys; + return $this->localObjectReference; } public function setName($name) { @@ -45,12 +44,12 @@ class Google_Service_Vision_GoogleCloudVisionV1p5beta1ReferenceImage extends Goo { return $this->name; } - public function setUri($uri) + public function setOptional($optional) { - $this->uri = $uri; + $this->optional = $optional; } - public function getUri() + public function getOptional() { - return $this->uri; + return $this->optional; } } diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/SecretKeySelector.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/SecretKeySelector.php new file mode 100644 index 0000000..1be6283 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/SecretKeySelector.php @@ -0,0 +1,64 @@ +key = $key; + } + public function getKey() + { + return $this->key; + } + /** + * @param Google_Service_CloudRun_LocalObjectReference + */ + public function setLocalObjectReference(Google_Service_CloudRun_LocalObjectReference $localObjectReference) + { + $this->localObjectReference = $localObjectReference; + } + /** + * @return Google_Service_CloudRun_LocalObjectReference + */ + public function getLocalObjectReference() + { + return $this->localObjectReference; + } + public function setName($name) + { + $this->name = $name; + } + public function getName() + { + return $this->name; + } + public function setOptional($optional) + { + $this->optional = $optional; + } + public function getOptional() + { + return $this->optional; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/SecretVolumeSource.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/SecretVolumeSource.php new file mode 100644 index 0000000..aaf6b45 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/SecretVolumeSource.php @@ -0,0 +1,65 @@ +defaultMode = $defaultMode; + } + public function getDefaultMode() + { + return $this->defaultMode; + } + /** + * @param Google_Service_CloudRun_KeyToPath + */ + public function setItems($items) + { + $this->items = $items; + } + /** + * @return Google_Service_CloudRun_KeyToPath + */ + public function getItems() + { + return $this->items; + } + public function setOptional($optional) + { + $this->optional = $optional; + } + public function getOptional() + { + return $this->optional; + } + public function setSecretName($secretName) + { + $this->secretName = $secretName; + } + public function getSecretName() + { + return $this->secretName; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/SecurityContext.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/SecurityContext.php new file mode 100644 index 0000000..ec80091 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/SecurityContext.php @@ -0,0 +1,30 @@ +runAsUser = $runAsUser; + } + public function getRunAsUser() + { + return $this->runAsUser; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/Service.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Service.php new file mode 100644 index 0000000..0bbe716 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Service.php @@ -0,0 +1,87 @@ +apiVersion = $apiVersion; + } + public function getApiVersion() + { + return $this->apiVersion; + } + public function setKind($kind) + { + $this->kind = $kind; + } + public function getKind() + { + return $this->kind; + } + /** + * @param Google_Service_CloudRun_ObjectMeta + */ + public function setMetadata(Google_Service_CloudRun_ObjectMeta $metadata) + { + $this->metadata = $metadata; + } + /** + * @return Google_Service_CloudRun_ObjectMeta + */ + public function getMetadata() + { + return $this->metadata; + } + /** + * @param Google_Service_CloudRun_ServiceSpec + */ + public function setSpec(Google_Service_CloudRun_ServiceSpec $spec) + { + $this->spec = $spec; + } + /** + * @return Google_Service_CloudRun_ServiceSpec + */ + public function getSpec() + { + return $this->spec; + } + /** + * @param Google_Service_CloudRun_ServiceStatus + */ + public function setStatus(Google_Service_CloudRun_ServiceStatus $status) + { + $this->status = $status; + } + /** + * @return Google_Service_CloudRun_ServiceStatus + */ + public function getStatus() + { + return $this->status; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/ServiceSpec.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ServiceSpec.php new file mode 100644 index 0000000..f56c1e3 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ServiceSpec.php @@ -0,0 +1,54 @@ +template = $template; + } + /** + * @return Google_Service_CloudRun_RevisionTemplate + */ + public function getTemplate() + { + return $this->template; + } + /** + * @param Google_Service_CloudRun_TrafficTarget + */ + public function setTraffic($traffic) + { + $this->traffic = $traffic; + } + /** + * @return Google_Service_CloudRun_TrafficTarget + */ + public function getTraffic() + { + return $this->traffic; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/ServiceStatus.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ServiceStatus.php new file mode 100644 index 0000000..81f4ea5 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/ServiceStatus.php @@ -0,0 +1,106 @@ +address = $address; + } + /** + * @return Google_Service_CloudRun_Addressable + */ + public function getAddress() + { + return $this->address; + } + /** + * @param Google_Service_CloudRun_GoogleCloudRunV1Condition + */ + public function setConditions($conditions) + { + $this->conditions = $conditions; + } + /** + * @return Google_Service_CloudRun_GoogleCloudRunV1Condition + */ + public function getConditions() + { + return $this->conditions; + } + public function setLatestCreatedRevisionName($latestCreatedRevisionName) + { + $this->latestCreatedRevisionName = $latestCreatedRevisionName; + } + public function getLatestCreatedRevisionName() + { + return $this->latestCreatedRevisionName; + } + public function setLatestReadyRevisionName($latestReadyRevisionName) + { + $this->latestReadyRevisionName = $latestReadyRevisionName; + } + public function getLatestReadyRevisionName() + { + return $this->latestReadyRevisionName; + } + public function setObservedGeneration($observedGeneration) + { + $this->observedGeneration = $observedGeneration; + } + public function getObservedGeneration() + { + return $this->observedGeneration; + } + /** + * @param Google_Service_CloudRun_TrafficTarget + */ + public function setTraffic($traffic) + { + $this->traffic = $traffic; + } + /** + * @return Google_Service_CloudRun_TrafficTarget + */ + public function getTraffic() + { + return $this->traffic; + } + public function setUrl($url) + { + $this->url = $url; + } + public function getUrl() + { + return $this->url; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/BoundingPoly.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/SetIamPolicyRequest.php similarity index 52% rename from vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/BoundingPoly.php rename to vendor/google/apiclient-services/src/Google/Service/CloudRun/SetIamPolicyRequest.php index 95a313a..3f05773 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/BoundingPoly.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/SetIamPolicyRequest.php @@ -15,33 +15,32 @@ * the License. */ -class Google_Service_CloudHealthcare_BoundingPoly extends Google_Collection +class Google_Service_CloudRun_SetIamPolicyRequest extends Google_Model { - protected $collection_key = 'vertices'; - public $label; - protected $verticesType = 'Google_Service_CloudHealthcare_Vertex'; - protected $verticesDataType = 'array'; + protected $policyType = 'Google_Service_CloudRun_Policy'; + protected $policyDataType = ''; + public $updateMask; - public function setLabel($label) + /** + * @param Google_Service_CloudRun_Policy + */ + public function setPolicy(Google_Service_CloudRun_Policy $policy) { - $this->label = $label; - } - public function getLabel() - { - return $this->label; + $this->policy = $policy; } /** - * @param Google_Service_CloudHealthcare_Vertex + * @return Google_Service_CloudRun_Policy */ - public function setVertices($vertices) + public function getPolicy() { - $this->vertices = $vertices; + return $this->policy; } - /** - * @return Google_Service_CloudHealthcare_Vertex - */ - public function getVertices() + public function setUpdateMask($updateMask) { - return $this->vertices; + $this->updateMask = $updateMask; + } + public function getUpdateMask() + { + return $this->updateMask; } } diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/Status.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Status.php new file mode 100644 index 0000000..decbce0 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Status.php @@ -0,0 +1,89 @@ +code = $code; + } + public function getCode() + { + return $this->code; + } + /** + * @param Google_Service_CloudRun_StatusDetails + */ + public function setDetails(Google_Service_CloudRun_StatusDetails $details) + { + $this->details = $details; + } + /** + * @return Google_Service_CloudRun_StatusDetails + */ + public function getDetails() + { + return $this->details; + } + public function setMessage($message) + { + $this->message = $message; + } + public function getMessage() + { + return $this->message; + } + /** + * @param Google_Service_CloudRun_ListMeta + */ + public function setMetadata(Google_Service_CloudRun_ListMeta $metadata) + { + $this->metadata = $metadata; + } + /** + * @return Google_Service_CloudRun_ListMeta + */ + public function getMetadata() + { + return $this->metadata; + } + public function setReason($reason) + { + $this->reason = $reason; + } + public function getReason() + { + return $this->reason; + } + public function setStatus($status) + { + $this->status = $status; + } + public function getStatus() + { + return $this->status; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/StatusCause.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/StatusCause.php new file mode 100644 index 0000000..c7a975d --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/StatusCause.php @@ -0,0 +1,48 @@ +field = $field; + } + public function getField() + { + return $this->field; + } + 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; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/StatusDetails.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/StatusDetails.php new file mode 100644 index 0000000..c100e2f --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/StatusDetails.php @@ -0,0 +1,83 @@ +causes = $causes; + } + /** + * @return Google_Service_CloudRun_StatusCause + */ + public function getCauses() + { + return $this->causes; + } + public function setGroup($group) + { + $this->group = $group; + } + public function getGroup() + { + return $this->group; + } + 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 setRetryAfterSeconds($retryAfterSeconds) + { + $this->retryAfterSeconds = $retryAfterSeconds; + } + public function getRetryAfterSeconds() + { + return $this->retryAfterSeconds; + } + public function setUid($uid) + { + $this->uid = $uid; + } + public function getUid() + { + return $this->uid; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/ImageAnnotation.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/TCPSocketAction.php similarity index 54% rename from vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/ImageAnnotation.php rename to vendor/google/apiclient-services/src/Google/Service/CloudRun/TCPSocketAction.php index ac4a502..2a4f78d 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/ImageAnnotation.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/TCPSocketAction.php @@ -15,24 +15,32 @@ * the License. */ -class Google_Service_CloudHealthcare_ImageAnnotation extends Google_Collection +class Google_Service_CloudRun_TCPSocketAction extends Google_Model { - protected $collection_key = 'boundingPolys'; - protected $boundingPolysType = 'Google_Service_CloudHealthcare_BoundingPoly'; - protected $boundingPolysDataType = 'array'; + public $host; + protected $portType = 'Google_Service_CloudRun_IntOrString'; + protected $portDataType = ''; - /** - * @param Google_Service_CloudHealthcare_BoundingPoly - */ - public function setBoundingPolys($boundingPolys) + public function setHost($host) { - $this->boundingPolys = $boundingPolys; + $this->host = $host; + } + public function getHost() + { + return $this->host; } /** - * @return Google_Service_CloudHealthcare_BoundingPoly + * @param Google_Service_CloudRun_IntOrString */ - public function getBoundingPolys() + public function setPort(Google_Service_CloudRun_IntOrString $port) { - return $this->boundingPolys; + $this->port = $port; + } + /** + * @return Google_Service_CloudRun_IntOrString + */ + public function getPort() + { + return $this->port; } } diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/TestIamPermissionsRequest.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/TestIamPermissionsRequest.php new file mode 100644 index 0000000..e9cc253 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/TestIamPermissionsRequest.php @@ -0,0 +1,31 @@ +permissions = $permissions; + } + public function getPermissions() + { + return $this->permissions; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/TestIamPermissionsResponse.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/TestIamPermissionsResponse.php new file mode 100644 index 0000000..8ffd91e --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/TestIamPermissionsResponse.php @@ -0,0 +1,31 @@ +permissions = $permissions; + } + public function getPermissions() + { + return $this->permissions; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/TrafficTarget.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/TrafficTarget.php new file mode 100644 index 0000000..6d6f398 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/TrafficTarget.php @@ -0,0 +1,75 @@ +configurationName = $configurationName; + } + public function getConfigurationName() + { + return $this->configurationName; + } + public function setLatestRevision($latestRevision) + { + $this->latestRevision = $latestRevision; + } + public function getLatestRevision() + { + return $this->latestRevision; + } + public function setPercent($percent) + { + $this->percent = $percent; + } + public function getPercent() + { + return $this->percent; + } + public function setRevisionName($revisionName) + { + $this->revisionName = $revisionName; + } + public function getRevisionName() + { + return $this->revisionName; + } + public function setTag($tag) + { + $this->tag = $tag; + } + public function getTag() + { + return $this->tag; + } + public function setUrl($url) + { + $this->url = $url; + } + public function getUrl() + { + return $this->url; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/Volume.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Volume.php new file mode 100644 index 0000000..a426f17 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/Volume.php @@ -0,0 +1,62 @@ +configMap = $configMap; + } + /** + * @return Google_Service_CloudRun_ConfigMapVolumeSource + */ + public function getConfigMap() + { + return $this->configMap; + } + public function setName($name) + { + $this->name = $name; + } + public function getName() + { + return $this->name; + } + /** + * @param Google_Service_CloudRun_SecretVolumeSource + */ + public function setSecret(Google_Service_CloudRun_SecretVolumeSource $secret) + { + $this->secret = $secret; + } + /** + * @return Google_Service_CloudRun_SecretVolumeSource + */ + public function getSecret() + { + return $this->secret; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudRun/VolumeMount.php b/vendor/google/apiclient-services/src/Google/Service/CloudRun/VolumeMount.php new file mode 100644 index 0000000..3d5c2c3 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudRun/VolumeMount.php @@ -0,0 +1,57 @@ +mountPath = $mountPath; + } + public function getMountPath() + { + return $this->mountPath; + } + public function setName($name) + { + $this->name = $name; + } + public function getName() + { + return $this->name; + } + public function setReadOnly($readOnly) + { + $this->readOnly = $readOnly; + } + public function getReadOnly() + { + return $this->readOnly; + } + public function setSubPath($subPath) + { + $this->subPath = $subPath; + } + public function getSubPath() + { + return $this->subPath; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudScheduler/Resource/ProjectsLocationsJobs.php b/vendor/google/apiclient-services/src/Google/Service/CloudScheduler/Resource/ProjectsLocationsJobs.php index fa257f0..b97a67b 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudScheduler/Resource/ProjectsLocationsJobs.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudScheduler/Resource/ProjectsLocationsJobs.php @@ -28,9 +28,8 @@ class Google_Service_CloudScheduler_Resource_ProjectsLocationsJobs extends Googl /** * Creates a job. (jobs.create) * - * @param string $parent Required. - * - * The location name. For example: `projects/PROJECT_ID/locations/LOCATION_ID`. + * @param string $parent Required. The location name. For example: + * `projects/PROJECT_ID/locations/LOCATION_ID`. * @param Google_Service_CloudScheduler_Job $postBody * @param array $optParams Optional parameters. * @return Google_Service_CloudScheduler_Job @@ -44,9 +43,7 @@ class Google_Service_CloudScheduler_Resource_ProjectsLocationsJobs extends Googl /** * Deletes a job. (jobs.delete) * - * @param string $name Required. - * - * The job name. For example: + * @param string $name Required. The job name. For example: * `projects/PROJECT_ID/locations/LOCATION_ID/jobs/JOB_ID`. * @param array $optParams Optional parameters. * @return Google_Service_CloudScheduler_CloudschedulerEmpty @@ -60,9 +57,7 @@ class Google_Service_CloudScheduler_Resource_ProjectsLocationsJobs extends Googl /** * Gets a job. (jobs.get) * - * @param string $name Required. - * - * The job name. For example: + * @param string $name Required. The job name. For example: * `projects/PROJECT_ID/locations/LOCATION_ID/jobs/JOB_ID`. * @param array $optParams Optional parameters. * @return Google_Service_CloudScheduler_Job @@ -76,9 +71,8 @@ class Google_Service_CloudScheduler_Resource_ProjectsLocationsJobs extends Googl /** * Lists jobs. (jobs.listProjectsLocationsJobs) * - * @param string $parent Required. - * - * The location name. For example: `projects/PROJECT_ID/locations/LOCATION_ID`. + * @param string $parent Required. The location name. For example: + * `projects/PROJECT_ID/locations/LOCATION_ID`. * @param array $optParams Optional parameters. * * @opt_param string pageToken A token identifying a page of results the server @@ -146,9 +140,7 @@ class Google_Service_CloudScheduler_Resource_ProjectsLocationsJobs extends Googl * it will be set to Job.State.PAUSED. A job must be in Job.State.ENABLED to be * paused. (jobs.pause) * - * @param string $name Required. - * - * The job name. For example: + * @param string $name Required. The job name. For example: * `projects/PROJECT_ID/locations/LOCATION_ID/jobs/JOB_ID`. * @param Google_Service_CloudScheduler_PauseJobRequest $postBody * @param array $optParams Optional parameters. @@ -168,9 +160,7 @@ class Google_Service_CloudScheduler_Resource_ProjectsLocationsJobs extends Googl * Job.State.ENABLED. A job must be in Job.State.PAUSED to be resumed. * (jobs.resume) * - * @param string $name Required. - * - * The job name. For example: + * @param string $name Required. The job name. For example: * `projects/PROJECT_ID/locations/LOCATION_ID/jobs/JOB_ID`. * @param Google_Service_CloudScheduler_ResumeJobRequest $postBody * @param array $optParams Optional parameters. @@ -188,9 +178,7 @@ class Google_Service_CloudScheduler_Resource_ProjectsLocationsJobs extends Googl * When this method is called, Cloud Scheduler will dispatch the job, even if * the job is already running. (jobs.run) * - * @param string $name Required. - * - * The job name. For example: + * @param string $name Required. The job name. For example: * `projects/PROJECT_ID/locations/LOCATION_ID/jobs/JOB_ID`. * @param Google_Service_CloudScheduler_RunJobRequest $postBody * @param array $optParams Optional parameters. diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudSearch.php b/vendor/google/apiclient-services/src/Google/Service/CloudSearch.php index 7c3ff53..e55ceb0 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudSearch.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudSearch.php @@ -73,6 +73,9 @@ class Google_Service_CloudSearch extends Google_Service public $settings_searchapplications; public $stats; public $stats_index_datasources; + public $stats_query_searchapplications; + public $stats_session_searchapplications; + public $stats_user_searchapplications; /** * Constructs the internal representation of the CloudSearch service. @@ -170,14 +173,6 @@ class Google_Service_CloudSearch extends Google_Service 'type' => 'string', 'required' => true, ), - 'groupResourceName' => array( - 'location' => 'query', - 'type' => 'string', - ), - 'userResourceName' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -190,6 +185,14 @@ class Google_Service_CloudSearch extends Google_Service 'location' => 'query', 'type' => 'boolean', ), + 'groupResourceName' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'userResourceName' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ), ) @@ -294,10 +297,6 @@ class Google_Service_CloudSearch extends Google_Service 'type' => 'string', 'required' => true, ), - 'connectorName' => array( - 'location' => 'query', - 'type' => 'string', - ), 'version' => array( 'location' => 'query', 'type' => 'string', @@ -310,6 +309,10 @@ class Google_Service_CloudSearch extends Google_Service 'location' => 'query', 'type' => 'string', ), + 'connectorName' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'deleteQueueItems' => array( 'path' => 'v1/indexing/{+name}/items:deleteQueueItems', @@ -358,14 +361,6 @@ class Google_Service_CloudSearch extends Google_Service 'type' => 'string', 'required' => true, ), - 'connectorName' => array( - 'location' => 'query', - 'type' => 'string', - ), - 'brief' => array( - 'location' => 'query', - 'type' => 'boolean', - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -378,6 +373,14 @@ class Google_Service_CloudSearch extends Google_Service 'location' => 'query', 'type' => 'boolean', ), + 'connectorName' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'brief' => array( + 'location' => 'query', + 'type' => 'boolean', + ), ), ),'poll' => array( 'path' => 'v1/indexing/{+name}/items:poll', @@ -491,6 +494,14 @@ class Google_Service_CloudSearch extends Google_Service 'path' => 'v1/query/sources', 'httpMethod' => 'GET', 'parameters' => array( + 'requestOptions.languageCode' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'requestOptions.searchApplicationId' => array( + 'location' => 'query', + 'type' => 'string', + ), 'requestOptions.timeZone' => array( 'location' => 'query', 'type' => 'string', @@ -503,14 +514,6 @@ class Google_Service_CloudSearch extends Google_Service 'location' => 'query', 'type' => 'boolean', ), - 'requestOptions.languageCode' => array( - 'location' => 'query', - 'type' => 'string', - ), - 'requestOptions.searchApplicationId' => array( - 'location' => 'query', - 'type' => 'string', - ), ), ), ) @@ -558,10 +561,6 @@ class Google_Service_CloudSearch extends Google_Service 'path' => 'v1/settings/datasources', 'httpMethod' => 'GET', 'parameters' => array( - 'debugOptions.enableDebugging' => array( - 'location' => 'query', - 'type' => 'boolean', - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -570,6 +569,10 @@ class Google_Service_CloudSearch extends Google_Service 'location' => 'query', 'type' => 'integer', ), + 'debugOptions.enableDebugging' => array( + 'location' => 'query', + 'type' => 'boolean', + ), ), ),'update' => array( 'path' => 'v1/settings/{+name}', @@ -627,6 +630,10 @@ class Google_Service_CloudSearch extends Google_Service 'path' => 'v1/settings/searchapplications', 'httpMethod' => 'GET', 'parameters' => array( + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), 'pageSize' => array( 'location' => 'query', 'type' => 'integer', @@ -635,10 +642,6 @@ class Google_Service_CloudSearch extends Google_Service 'location' => 'query', 'type' => 'boolean', ), - 'pageToken' => array( - 'location' => 'query', - 'type' => 'string', - ), ), ),'reset' => array( 'path' => 'v1/settings/{+name}:reset', @@ -699,24 +702,42 @@ class Google_Service_CloudSearch extends Google_Service 'type' => 'integer', ), ), - ), - ) - ) - ); - $this->stats_index_datasources = new Google_Service_CloudSearch_Resource_StatsIndexDatasources( - $this, - $this->serviceName, - 'datasources', - array( - 'methods' => array( - 'get' => array( - 'path' => 'v1/stats/index/{+name}', + ),'getQuery' => array( + 'path' => 'v1/stats/query', 'httpMethod' => 'GET', 'parameters' => array( - 'name' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, + 'fromDate.year' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'toDate.day' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'toDate.month' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'toDate.year' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'fromDate.month' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'fromDate.day' => array( + 'location' => 'query', + 'type' => 'integer', + ), + ), + ),'getSession' => array( + 'path' => 'v1/stats/session', + 'httpMethod' => 'GET', + 'parameters' => array( + 'toDate.year' => array( + 'location' => 'query', + 'type' => 'integer', ), 'fromDate.month' => array( 'location' => 'query', @@ -738,10 +759,211 @@ class Google_Service_CloudSearch extends Google_Service 'location' => 'query', 'type' => 'integer', ), + ), + ),'getUser' => array( + 'path' => 'v1/stats/user', + 'httpMethod' => 'GET', + 'parameters' => array( + 'fromDate.day' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'fromDate.year' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'toDate.day' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'toDate.month' => array( + 'location' => 'query', + 'type' => 'integer', + ), 'toDate.year' => array( 'location' => 'query', 'type' => 'integer', ), + 'fromDate.month' => array( + 'location' => 'query', + 'type' => 'integer', + ), + ), + ), + ) + ) + ); + $this->stats_index_datasources = new Google_Service_CloudSearch_Resource_StatsIndexDatasources( + $this, + $this->serviceName, + 'datasources', + array( + 'methods' => array( + 'get' => array( + 'path' => 'v1/stats/index/{+name}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'toDate.day' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'toDate.month' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'toDate.year' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'fromDate.month' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'fromDate.day' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'fromDate.year' => array( + 'location' => 'query', + 'type' => 'integer', + ), + ), + ), + ) + ) + ); + $this->stats_query_searchapplications = new Google_Service_CloudSearch_Resource_StatsQuerySearchapplications( + $this, + $this->serviceName, + 'searchapplications', + array( + 'methods' => array( + 'get' => array( + 'path' => 'v1/stats/query/{+name}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'toDate.month' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'toDate.year' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'fromDate.month' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'fromDate.day' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'fromDate.year' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'toDate.day' => array( + 'location' => 'query', + 'type' => 'integer', + ), + ), + ), + ) + ) + ); + $this->stats_session_searchapplications = new Google_Service_CloudSearch_Resource_StatsSessionSearchapplications( + $this, + $this->serviceName, + 'searchapplications', + array( + 'methods' => array( + 'get' => array( + 'path' => 'v1/stats/session/{+name}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'fromDate.day' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'fromDate.year' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'toDate.day' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'toDate.month' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'toDate.year' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'fromDate.month' => array( + 'location' => 'query', + 'type' => 'integer', + ), + ), + ), + ) + ) + ); + $this->stats_user_searchapplications = new Google_Service_CloudSearch_Resource_StatsUserSearchapplications( + $this, + $this->serviceName, + 'searchapplications', + array( + 'methods' => array( + 'get' => array( + 'path' => 'v1/stats/user/{+name}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'fromDate.year' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'toDate.day' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'toDate.month' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'toDate.year' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'fromDate.month' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'fromDate.day' => array( + 'location' => 'query', + 'type' => 'integer', + ), ), ), ) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/CustomerQueryStats.php b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/CustomerQueryStats.php new file mode 100644 index 0000000..c159c15 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/CustomerQueryStats.php @@ -0,0 +1,54 @@ +date = $date; + } + /** + * @return Google_Service_CloudSearch_Date + */ + public function getDate() + { + return $this->date; + } + /** + * @param Google_Service_CloudSearch_QueryCountByStatus + */ + public function setQueryCountByStatus($queryCountByStatus) + { + $this->queryCountByStatus = $queryCountByStatus; + } + /** + * @return Google_Service_CloudSearch_QueryCountByStatus + */ + public function getQueryCountByStatus() + { + return $this->queryCountByStatus; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/AnnotationSource.php b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/CustomerSessionStats.php similarity index 50% rename from vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/AnnotationSource.php rename to vendor/google/apiclient-services/src/Google/Service/CloudSearch/CustomerSessionStats.php index 2f6b221..0aa8ece 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/AnnotationSource.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/CustomerSessionStats.php @@ -15,23 +15,32 @@ * the License. */ -class Google_Service_CloudHealthcare_AnnotationSource extends Google_Model +class Google_Service_CloudSearch_CustomerSessionStats extends Google_Model { - protected $cloudHealthcareSourceType = 'Google_Service_CloudHealthcare_CloudHealthcareSource'; - protected $cloudHealthcareSourceDataType = ''; + protected $dateType = 'Google_Service_CloudSearch_Date'; + protected $dateDataType = ''; + public $searchSessionsCount; /** - * @param Google_Service_CloudHealthcare_CloudHealthcareSource + * @param Google_Service_CloudSearch_Date */ - public function setCloudHealthcareSource(Google_Service_CloudHealthcare_CloudHealthcareSource $cloudHealthcareSource) + public function setDate(Google_Service_CloudSearch_Date $date) { - $this->cloudHealthcareSource = $cloudHealthcareSource; + $this->date = $date; } /** - * @return Google_Service_CloudHealthcare_CloudHealthcareSource + * @return Google_Service_CloudSearch_Date */ - public function getCloudHealthcareSource() + public function getDate() { - return $this->cloudHealthcareSource; + return $this->date; + } + public function setSearchSessionsCount($searchSessionsCount) + { + $this->searchSessionsCount = $searchSessionsCount; + } + public function getSearchSessionsCount() + { + return $this->searchSessionsCount; } } diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/CustomerUserStats.php b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/CustomerUserStats.php new file mode 100644 index 0000000..d4cb132 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/CustomerUserStats.php @@ -0,0 +1,64 @@ +date = $date; + } + /** + * @return Google_Service_CloudSearch_Date + */ + public function getDate() + { + return $this->date; + } + public function setOneDayActiveUsersCount($oneDayActiveUsersCount) + { + $this->oneDayActiveUsersCount = $oneDayActiveUsersCount; + } + public function getOneDayActiveUsersCount() + { + return $this->oneDayActiveUsersCount; + } + public function setSevenDaysActiveUsersCount($sevenDaysActiveUsersCount) + { + $this->sevenDaysActiveUsersCount = $sevenDaysActiveUsersCount; + } + public function getSevenDaysActiveUsersCount() + { + return $this->sevenDaysActiveUsersCount; + } + public function setThirtyDaysActiveUsersCount($thirtyDaysActiveUsersCount) + { + $this->thirtyDaysActiveUsersCount = $thirtyDaysActiveUsersCount; + } + public function getThirtyDaysActiveUsersCount() + { + return $this->thirtyDaysActiveUsersCount; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/GetCustomerQueryStatsResponse.php b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/GetCustomerQueryStatsResponse.php new file mode 100644 index 0000000..5a4ca24 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/GetCustomerQueryStatsResponse.php @@ -0,0 +1,38 @@ +stats = $stats; + } + /** + * @return Google_Service_CloudSearch_CustomerQueryStats + */ + public function getStats() + { + return $this->stats; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/GetCustomerSessionStatsResponse.php b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/GetCustomerSessionStatsResponse.php new file mode 100644 index 0000000..176095b --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/GetCustomerSessionStatsResponse.php @@ -0,0 +1,38 @@ +stats = $stats; + } + /** + * @return Google_Service_CloudSearch_CustomerSessionStats + */ + public function getStats() + { + return $this->stats; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/GetCustomerUserStatsResponse.php b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/GetCustomerUserStatsResponse.php new file mode 100644 index 0000000..021fe21 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/GetCustomerUserStatsResponse.php @@ -0,0 +1,38 @@ +stats = $stats; + } + /** + * @return Google_Service_CloudSearch_CustomerUserStats + */ + public function getStats() + { + return $this->stats; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/GetSearchApplicationQueryStatsResponse.php b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/GetSearchApplicationQueryStatsResponse.php new file mode 100644 index 0000000..4e651df --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/GetSearchApplicationQueryStatsResponse.php @@ -0,0 +1,38 @@ +stats = $stats; + } + /** + * @return Google_Service_CloudSearch_SearchApplicationQueryStats + */ + public function getStats() + { + return $this->stats; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/GetSearchApplicationSessionStatsResponse.php b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/GetSearchApplicationSessionStatsResponse.php new file mode 100644 index 0000000..0545c3b --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/GetSearchApplicationSessionStatsResponse.php @@ -0,0 +1,38 @@ +stats = $stats; + } + /** + * @return Google_Service_CloudSearch_SearchApplicationSessionStats + */ + public function getStats() + { + return $this->stats; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/GetSearchApplicationUserStatsResponse.php b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/GetSearchApplicationUserStatsResponse.php new file mode 100644 index 0000000..dee347a --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/GetSearchApplicationUserStatsResponse.php @@ -0,0 +1,38 @@ +stats = $stats; + } + /** + * @return Google_Service_CloudSearch_SearchApplicationUserStats + */ + public function getStats() + { + return $this->stats; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/PropertyDefinition.php b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/PropertyDefinition.php index e368ede..d3ac145 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/PropertyDefinition.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/PropertyDefinition.php @@ -35,6 +35,7 @@ class Google_Service_CloudSearch_PropertyDefinition extends Google_Model public $isRepeatable; public $isReturnable; public $isSortable; + public $isSuggestable; public $isWildcardSearchable; public $name; protected $objectPropertyOptionsType = 'Google_Service_CloudSearch_ObjectPropertyOptions'; @@ -174,6 +175,14 @@ class Google_Service_CloudSearch_PropertyDefinition extends Google_Model { return $this->isSortable; } + public function setIsSuggestable($isSuggestable) + { + $this->isSuggestable = $isSuggestable; + } + public function getIsSuggestable() + { + return $this->isSuggestable; + } public function setIsWildcardSearchable($isWildcardSearchable) { $this->isWildcardSearchable = $isWildcardSearchable; diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/QueryCountByStatus.php b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/QueryCountByStatus.php new file mode 100644 index 0000000..ed94dae --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/QueryCountByStatus.php @@ -0,0 +1,39 @@ +count = $count; + } + public function getCount() + { + return $this->count; + } + public function setStatusCode($statusCode) + { + $this->statusCode = $statusCode; + } + public function getStatusCode() + { + return $this->statusCode; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/QueryInterpretation.php b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/QueryInterpretation.php index 78fe0ed..8f2af70 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/QueryInterpretation.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/QueryInterpretation.php @@ -19,6 +19,7 @@ class Google_Service_CloudSearch_QueryInterpretation extends Google_Model { public $interpretationType; public $interpretedQuery; + public $reason; public function setInterpretationType($interpretationType) { @@ -36,4 +37,12 @@ class Google_Service_CloudSearch_QueryInterpretation extends Google_Model { return $this->interpretedQuery; } + public function setReason($reason) + { + $this->reason = $reason; + } + public function getReason() + { + return $this->reason; + } } diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/QueryInterpretationOptions.php b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/QueryInterpretationOptions.php index b2f4bde..bbf255c 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/QueryInterpretationOptions.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/QueryInterpretationOptions.php @@ -18,6 +18,7 @@ class Google_Service_CloudSearch_QueryInterpretationOptions extends Google_Model { public $disableNlInterpretation; + public $enableVerbatimMode; public function setDisableNlInterpretation($disableNlInterpretation) { @@ -27,4 +28,12 @@ class Google_Service_CloudSearch_QueryInterpretationOptions extends Google_Model { return $this->disableNlInterpretation; } + public function setEnableVerbatimMode($enableVerbatimMode) + { + $this->enableVerbatimMode = $enableVerbatimMode; + } + public function getEnableVerbatimMode() + { + return $this->enableVerbatimMode; + } } diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/DebugIdentitysourcesItems.php b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/DebugIdentitysourcesItems.php index db56c12..13f7763 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/DebugIdentitysourcesItems.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/DebugIdentitysourcesItems.php @@ -33,14 +33,14 @@ class Google_Service_CloudSearch_Resource_DebugIdentitysourcesItems extends Goog * format: identitysources/{source_id}} * @param array $optParams Optional parameters. * - * @opt_param string groupResourceName - * @opt_param string userResourceName * @opt_param string pageToken The next_page_token value returned from a * previous List request, if any. * @opt_param int pageSize Maximum number of items to fetch in a request. * Defaults to 100. * @opt_param bool debugOptions.enableDebugging If you are asked by Google to * help with debugging, set this field. Otherwise, ignore this field. + * @opt_param string groupResourceName + * @opt_param string userResourceName * @return Google_Service_CloudSearch_ListItemNamesForUnmappedIdentityResponse */ public function listForunmappedidentity($parent, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/IndexingDatasourcesItems.php b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/IndexingDatasourcesItems.php index 67d7e78..f4a455c 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/IndexingDatasourcesItems.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/IndexingDatasourcesItems.php @@ -26,14 +26,14 @@ class Google_Service_CloudSearch_Resource_IndexingDatasourcesItems extends Google_Service_Resource { /** - * Deletes Item resource for the specified resource name. (items.delete) + * Deletes Item resource for the specified resource name. This API requires an + * admin or service account to execute. The service account used is the one + * whitelisted in the corresponding data source. (items.delete) * * @param string $name Required. Name of the item to delete. Format: * datasources/{source_id}/items/{item_id} * @param array $optParams Optional parameters. * - * @opt_param string connectorName Name of connector making this call. Format: - * datasources/{source_id}/connectors/{ID} * @opt_param string version Required. The incremented version of the item to * delete from the index. The indexing system stores the version from the * datasource as a byte string and compares the Item version in the index to the @@ -45,6 +45,8 @@ class Google_Service_CloudSearch_Resource_IndexingDatasourcesItems extends Googl * @opt_param bool debugOptions.enableDebugging If you are asked by Google to * help with debugging, set this field. Otherwise, ignore this field. * @opt_param string mode Required. The RequestMode for this request. + * @opt_param string connectorName Name of connector making this call. Format: + * datasources/{source_id}/connectors/{ID} * @return Google_Service_CloudSearch_Operation */ public function delete($name, $optParams = array()) @@ -55,6 +57,9 @@ class Google_Service_CloudSearch_Resource_IndexingDatasourcesItems extends Googl } /** * Deletes all items in a queue. This method is useful for deleting stale items. + * + * This API requires an admin or service account to execute. The service account + * used is the one whitelisted in the corresponding data source. * (items.deleteQueueItems) * * @param string $name Name of the Data Source to delete items in a queue. @@ -70,7 +75,11 @@ class Google_Service_CloudSearch_Resource_IndexingDatasourcesItems extends Googl return $this->call('deleteQueueItems', array($params), "Google_Service_CloudSearch_Operation"); } /** - * Gets Item resource by item name. (items.get) + * Gets Item resource by item name. + * + * This API requires an admin or service account to execute. The service + * account used is the one whitelisted in the corresponding data source. + * (items.get) * * @param string $name Name of the item to get info. Format: * datasources/{source_id}/items/{item_id} @@ -91,7 +100,10 @@ class Google_Service_CloudSearch_Resource_IndexingDatasourcesItems extends Googl /** * Updates Item ACL, metadata, and content. It will insert the Item if it does * not exist. This method does not support partial updates. Fields with no - * provided values are cleared out in the Cloud Search index. (items.index) + * provided values are cleared out in the Cloud Search index. + * + * This API requires an admin or service account to execute. The service account + * used is the one whitelisted in the corresponding data source. (items.index) * * @param string $name Name of the Item. Format: * datasources/{source_id}/items/{item_id} This is a required field. The maximum @@ -107,18 +119,16 @@ class Google_Service_CloudSearch_Resource_IndexingDatasourcesItems extends Googl return $this->call('index', array($params), "Google_Service_CloudSearch_Operation"); } /** - * Lists all or a subset of Item resources. (items.listIndexingDatasourcesItems) + * Lists all or a subset of Item resources. + * + * This API requires an admin or service account to execute. The service account + * used is the one whitelisted in the corresponding data source. + * (items.listIndexingDatasourcesItems) * * @param string $name Name of the Data Source to list Items. Format: * datasources/{source_id} * @param array $optParams Optional parameters. * - * @opt_param string connectorName Name of connector making this call. Format: - * datasources/{source_id}/connectors/{ID} - * @opt_param bool brief When set to true, the indexing system only populates - * the following fields: name, version, metadata.hash, structured_data.hash, - * content.hash. If this value is false, then all the fields are populated in - * Item. * @opt_param string pageToken The next_page_token value returned from a * previous List request, if any. * @opt_param int pageSize Maximum number of items to fetch in a request. The @@ -126,6 +136,15 @@ class Google_Service_CloudSearch_Resource_IndexingDatasourcesItems extends Googl * The default value is 10 * @opt_param bool debugOptions.enableDebugging If you are asked by Google to * help with debugging, set this field. Otherwise, ignore this field. + * @opt_param string connectorName Name of connector making this call. Format: + * datasources/{source_id}/connectors/{ID} + * @opt_param bool brief When set to true, the indexing system only populates + * the following fields: name, version, queue. metadata.hash, metadata.title, + * metadata.sourceRepositoryURL, metadata.objectType, metadata.createTime, + * metadata.updateTime, metadata.contentLanguage, metadata.mimeType, + * structured_data.hash, content.hash, itemType, itemStatus.code, + * itemStatus.processingError.code, itemStatus.repositoryError.type, If this + * value is false, then all the fields are populated in Item. * @return Google_Service_CloudSearch_ListItemsResponse */ public function listIndexingDatasourcesItems($name, $optParams = array()) @@ -153,7 +172,10 @@ class Google_Service_CloudSearch_Resource_IndexingDatasourcesItems extends Googl * REQUEUE. * * Items automatically become available (unreserved) after 4 hours even if no - * update or push method is called. (items.poll) + * update or push method is called. + * + * This API requires an admin or service account to execute. The service account + * used is the one whitelisted in the corresponding data source. (items.poll) * * @param string $name Name of the Data Source to poll items. Format: * datasources/{source_id} @@ -168,7 +190,10 @@ class Google_Service_CloudSearch_Resource_IndexingDatasourcesItems extends Googl return $this->call('poll', array($params), "Google_Service_CloudSearch_PollItemsResponse"); } /** - * Pushes an item onto a queue for later polling and updating. (items.push) + * Pushes an item onto a queue for later polling and updating. + * + * This API requires an admin or service account to execute. The service account + * used is the one whitelisted in the corresponding data source. (items.push) * * @param string $name Name of the item to push into the indexing queue. Format: * datasources/{source_id}/items/{ID} This is a required field. The maximum @@ -186,7 +211,11 @@ class Google_Service_CloudSearch_Resource_IndexingDatasourcesItems extends Googl /** * Unreserves all items from a queue, making them all eligible to be polled. * This method is useful for resetting the indexing queue after a connector has - * been restarted. (items.unreserve) + * been restarted. + * + * This API requires an admin or service account to execute. The service account + * used is the one whitelisted in the corresponding data source. + * (items.unreserve) * * @param string $name Name of the Data Source to unreserve all items. Format: * datasources/{source_id} @@ -203,7 +232,9 @@ class Google_Service_CloudSearch_Resource_IndexingDatasourcesItems extends Googl /** * Creates an upload session for uploading item content. For items smaller than * 100 KB, it's easier to embed the content inline within an index request. - * (items.upload) + * + * This API requires an admin or service account to execute. The service account + * used is the one whitelisted in the corresponding data source. (items.upload) * * @param string $name Name of the Item to start a resumable upload. Format: * datasources/{source_id}/items/{item_id}. diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/QuerySources.php b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/QuerySources.php index e865791..9b8fd13 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/QuerySources.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/QuerySources.php @@ -31,15 +31,6 @@ class Google_Service_CloudSearch_Resource_QuerySources extends Google_Service_Re * * @param array $optParams Optional parameters. * - * @opt_param string requestOptions.timeZone Current user's time zone id, such - * as "America/Los_Angeles" or "Australia/Sydney". These IDs are defined by - * [Unicode Common Locale Data Repository (CLDR)](http://cldr.unicode.org/) - * project, and currently available in the file - * [timezone.xml](http://unicode.org/repos/cldr/trunk/common/bcp47/timezone.xml) - * @opt_param string pageToken Number of sources to return in the response. - * @opt_param bool requestOptions.debugOptions.enableDebugging If you are asked - * by Google to help with debugging, set this field. Otherwise, ignore this - * field. * @opt_param string requestOptions.languageCode The BCP-47 language code, such * as "en-US" or "sr-Latn". For more information, see * http://www.unicode.org/reports/tr35/#Unicode_locale_identifier. For @@ -50,6 +41,17 @@ class Google_Service_CloudSearch_Resource_QuerySources extends Google_Service_Re * only based on characters in the query. * @opt_param string requestOptions.searchApplicationId Id of the application * created using SearchApplicationsService. + * @opt_param string requestOptions.timeZone Current user's time zone id, such + * as "America/Los_Angeles" or "Australia/Sydney". These IDs are defined by + * [Unicode Common Locale Data Repository (CLDR)](http://cldr.unicode.org/) + * project, and currently available in the file [timezone.xml](http://unicode.or + * g/repos/cldr/trunk/common/bcp47/timezone.xml). This field is used to + * correctly interpret date and time queries. If this field is not specified, + * the default time zone (UTC) is used. + * @opt_param string pageToken Number of sources to return in the response. + * @opt_param bool requestOptions.debugOptions.enableDebugging If you are asked + * by Google to help with debugging, set this field. Otherwise, ignore this + * field. * @return Google_Service_CloudSearch_ListQuerySourcesResponse */ public function listQuerySources($optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/SettingsDatasources.php b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/SettingsDatasources.php index ac49bcd..bec5197 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/SettingsDatasources.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/SettingsDatasources.php @@ -76,11 +76,11 @@ class Google_Service_CloudSearch_Resource_SettingsDatasources extends Google_Ser * * @param array $optParams Optional parameters. * - * @opt_param bool debugOptions.enableDebugging If you are asked by Google to - * help with debugging, set this field. Otherwise, ignore this field. * @opt_param string pageToken Starting index of the results. * @opt_param int pageSize Maximum number of datasources to fetch in a request. * The max value is 100. The default value is 10 + * @opt_param bool debugOptions.enableDebugging If you are asked by Google to + * help with debugging, set this field. Otherwise, ignore this field. * @return Google_Service_CloudSearch_ListDataSourceResponse */ public function listSettingsDatasources($optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/SettingsSearchapplications.php b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/SettingsSearchapplications.php index f84021f..0ce9bb8 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/SettingsSearchapplications.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/SettingsSearchapplications.php @@ -78,11 +78,11 @@ class Google_Service_CloudSearch_Resource_SettingsSearchapplications extends Goo * * @param array $optParams Optional parameters. * + * @opt_param string pageToken The next_page_token value returned from a + * previous List request, if any. The default value is 10 * @opt_param int pageSize The maximum number of items to return. * @opt_param bool debugOptions.enableDebugging If you are asked by Google to * help with debugging, set this field. Otherwise, ignore this field. - * @opt_param string pageToken The next_page_token value returned from a - * previous List request, if any. The default value is 10 * @return Google_Service_CloudSearch_ListSearchApplicationsResponse */ public function listSettingsSearchapplications($optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/Stats.php b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/Stats.php index c4d49f4..009f721 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/Stats.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/Stats.php @@ -48,4 +48,67 @@ class Google_Service_CloudSearch_Resource_Stats extends Google_Service_Resource $params = array_merge($params, $optParams); return $this->call('getIndex', array($params), "Google_Service_CloudSearch_GetCustomerIndexStatsResponse"); } + /** + * Get the query statistics for customer (stats.getQuery) + * + * @param array $optParams Optional parameters. + * + * @opt_param int fromDate.year Year of date. Must be from 1 to 9999. + * @opt_param int toDate.day Day of month. Must be from 1 to 31 and valid for + * the year and month. + * @opt_param int toDate.month Month of date. Must be from 1 to 12. + * @opt_param int toDate.year Year of date. Must be from 1 to 9999. + * @opt_param int fromDate.month Month of date. Must be from 1 to 12. + * @opt_param int fromDate.day Day of month. Must be from 1 to 31 and valid for + * the year and month. + * @return Google_Service_CloudSearch_GetCustomerQueryStatsResponse + */ + public function getQuery($optParams = array()) + { + $params = array(); + $params = array_merge($params, $optParams); + return $this->call('getQuery', array($params), "Google_Service_CloudSearch_GetCustomerQueryStatsResponse"); + } + /** + * Get the # of search sessions for the customer (stats.getSession) + * + * @param array $optParams Optional parameters. + * + * @opt_param int toDate.year Year of date. Must be from 1 to 9999. + * @opt_param int fromDate.month Month of date. Must be from 1 to 12. + * @opt_param int fromDate.day Day of month. Must be from 1 to 31 and valid for + * the year and month. + * @opt_param int fromDate.year Year of date. Must be from 1 to 9999. + * @opt_param int toDate.day Day of month. Must be from 1 to 31 and valid for + * the year and month. + * @opt_param int toDate.month Month of date. Must be from 1 to 12. + * @return Google_Service_CloudSearch_GetCustomerSessionStatsResponse + */ + public function getSession($optParams = array()) + { + $params = array(); + $params = array_merge($params, $optParams); + return $this->call('getSession', array($params), "Google_Service_CloudSearch_GetCustomerSessionStatsResponse"); + } + /** + * Get the users statistics for customer (stats.getUser) + * + * @param array $optParams Optional parameters. + * + * @opt_param int fromDate.day Day of month. Must be from 1 to 31 and valid for + * the year and month. + * @opt_param int fromDate.year Year of date. Must be from 1 to 9999. + * @opt_param int toDate.day Day of month. Must be from 1 to 31 and valid for + * the year and month. + * @opt_param int toDate.month Month of date. Must be from 1 to 12. + * @opt_param int toDate.year Year of date. Must be from 1 to 9999. + * @opt_param int fromDate.month Month of date. Must be from 1 to 12. + * @return Google_Service_CloudSearch_GetCustomerUserStatsResponse + */ + public function getUser($optParams = array()) + { + $params = array(); + $params = array_merge($params, $optParams); + return $this->call('getUser', array($params), "Google_Service_CloudSearch_GetCustomerUserStatsResponse"); + } } diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/StatsIndexDatasources.php b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/StatsIndexDatasources.php index 51191be..44ca219 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/StatsIndexDatasources.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/StatsIndexDatasources.php @@ -32,14 +32,14 @@ class Google_Service_CloudSearch_Resource_StatsIndexDatasources extends Google_S * for, in the following format: "datasources/{source_id}" * @param array $optParams Optional parameters. * - * @opt_param int fromDate.month Month of date. Must be from 1 to 12. - * @opt_param int fromDate.day Day of month. Must be from 1 to 31 and valid for - * the year and month. - * @opt_param int fromDate.year Year of date. Must be from 1 to 9999. * @opt_param int toDate.day Day of month. Must be from 1 to 31 and valid for * the year and month. * @opt_param int toDate.month Month of date. Must be from 1 to 12. * @opt_param int toDate.year Year of date. Must be from 1 to 9999. + * @opt_param int fromDate.month Month of date. Must be from 1 to 12. + * @opt_param int fromDate.day Day of month. Must be from 1 to 31 and valid for + * the year and month. + * @opt_param int fromDate.year Year of date. Must be from 1 to 9999. * @return Google_Service_CloudSearch_GetDataSourceIndexStatsResponse */ public function get($name, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/StatsQuery.php b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/StatsQuery.php new file mode 100644 index 0000000..15309df --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/StatsQuery.php @@ -0,0 +1,28 @@ + + * $cloudsearchService = new Google_Service_CloudSearch(...); + * $query = $cloudsearchService->query; + * + */ +class Google_Service_CloudSearch_Resource_StatsQuery extends Google_Service_Resource +{ +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/StatsQuerySearchapplications.php b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/StatsQuerySearchapplications.php new file mode 100644 index 0000000..100f777 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/StatsQuerySearchapplications.php @@ -0,0 +1,51 @@ + + * $cloudsearchService = new Google_Service_CloudSearch(...); + * $searchapplications = $cloudsearchService->searchapplications; + * + */ +class Google_Service_CloudSearch_Resource_StatsQuerySearchapplications extends Google_Service_Resource +{ + /** + * Get the query statistics for search application (searchapplications.get) + * + * @param string $name The resource id of the search application query stats, in + * the following format: searchapplications/{application_id} + * @param array $optParams Optional parameters. + * + * @opt_param int toDate.month Month of date. Must be from 1 to 12. + * @opt_param int toDate.year Year of date. Must be from 1 to 9999. + * @opt_param int fromDate.month Month of date. Must be from 1 to 12. + * @opt_param int fromDate.day Day of month. Must be from 1 to 31 and valid for + * the year and month. + * @opt_param int fromDate.year Year of date. Must be from 1 to 9999. + * @opt_param int toDate.day Day of month. Must be from 1 to 31 and valid for + * the year and month. + * @return Google_Service_CloudSearch_GetSearchApplicationQueryStatsResponse + */ + public function get($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('get', array($params), "Google_Service_CloudSearch_GetSearchApplicationQueryStatsResponse"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/StatsSession.php b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/StatsSession.php new file mode 100644 index 0000000..5b3dec9 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/StatsSession.php @@ -0,0 +1,28 @@ + + * $cloudsearchService = new Google_Service_CloudSearch(...); + * $session = $cloudsearchService->session; + * + */ +class Google_Service_CloudSearch_Resource_StatsSession extends Google_Service_Resource +{ +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/StatsSessionSearchapplications.php b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/StatsSessionSearchapplications.php new file mode 100644 index 0000000..6d264be --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/StatsSessionSearchapplications.php @@ -0,0 +1,52 @@ + + * $cloudsearchService = new Google_Service_CloudSearch(...); + * $searchapplications = $cloudsearchService->searchapplications; + * + */ +class Google_Service_CloudSearch_Resource_StatsSessionSearchapplications extends Google_Service_Resource +{ + /** + * Get the # of search sessions for the search application + * (searchapplications.get) + * + * @param string $name The resource id of the search application session stats, + * in the following format: searchapplications/{application_id} + * @param array $optParams Optional parameters. + * + * @opt_param int fromDate.day Day of month. Must be from 1 to 31 and valid for + * the year and month. + * @opt_param int fromDate.year Year of date. Must be from 1 to 9999. + * @opt_param int toDate.day Day of month. Must be from 1 to 31 and valid for + * the year and month. + * @opt_param int toDate.month Month of date. Must be from 1 to 12. + * @opt_param int toDate.year Year of date. Must be from 1 to 9999. + * @opt_param int fromDate.month Month of date. Must be from 1 to 12. + * @return Google_Service_CloudSearch_GetSearchApplicationSessionStatsResponse + */ + public function get($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('get', array($params), "Google_Service_CloudSearch_GetSearchApplicationSessionStatsResponse"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/StatsUser.php b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/StatsUser.php new file mode 100644 index 0000000..22ab01a --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/StatsUser.php @@ -0,0 +1,28 @@ + + * $cloudsearchService = new Google_Service_CloudSearch(...); + * $user = $cloudsearchService->user; + * + */ +class Google_Service_CloudSearch_Resource_StatsUser extends Google_Service_Resource +{ +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/StatsUserSearchapplications.php b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/StatsUserSearchapplications.php new file mode 100644 index 0000000..3b47252 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/Resource/StatsUserSearchapplications.php @@ -0,0 +1,51 @@ + + * $cloudsearchService = new Google_Service_CloudSearch(...); + * $searchapplications = $cloudsearchService->searchapplications; + * + */ +class Google_Service_CloudSearch_Resource_StatsUserSearchapplications extends Google_Service_Resource +{ + /** + * Get the users statistics for search application (searchapplications.get) + * + * @param string $name The resource id of the search application session stats, + * in the following format: searchapplications/{application_id} + * @param array $optParams Optional parameters. + * + * @opt_param int fromDate.year Year of date. Must be from 1 to 9999. + * @opt_param int toDate.day Day of month. Must be from 1 to 31 and valid for + * the year and month. + * @opt_param int toDate.month Month of date. Must be from 1 to 12. + * @opt_param int toDate.year Year of date. Must be from 1 to 9999. + * @opt_param int fromDate.month Month of date. Must be from 1 to 12. + * @opt_param int fromDate.day Day of month. Must be from 1 to 31 and valid for + * the year and month. + * @return Google_Service_CloudSearch_GetSearchApplicationUserStatsResponse + */ + public function get($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('get', array($params), "Google_Service_CloudSearch_GetSearchApplicationUserStatsResponse"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/SearchApplicationQueryStats.php b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/SearchApplicationQueryStats.php new file mode 100644 index 0000000..38bbb13 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/SearchApplicationQueryStats.php @@ -0,0 +1,54 @@ +date = $date; + } + /** + * @return Google_Service_CloudSearch_Date + */ + public function getDate() + { + return $this->date; + } + /** + * @param Google_Service_CloudSearch_QueryCountByStatus + */ + public function setQueryCountByStatus($queryCountByStatus) + { + $this->queryCountByStatus = $queryCountByStatus; + } + /** + * @return Google_Service_CloudSearch_QueryCountByStatus + */ + public function getQueryCountByStatus() + { + return $this->queryCountByStatus; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/SearchApplicationSessionStats.php b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/SearchApplicationSessionStats.php new file mode 100644 index 0000000..6d03d44 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/SearchApplicationSessionStats.php @@ -0,0 +1,46 @@ +date = $date; + } + /** + * @return Google_Service_CloudSearch_Date + */ + public function getDate() + { + return $this->date; + } + public function setSearchSessionsCount($searchSessionsCount) + { + $this->searchSessionsCount = $searchSessionsCount; + } + public function getSearchSessionsCount() + { + return $this->searchSessionsCount; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudSearch/SearchApplicationUserStats.php b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/SearchApplicationUserStats.php new file mode 100644 index 0000000..31a923e --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudSearch/SearchApplicationUserStats.php @@ -0,0 +1,64 @@ +date = $date; + } + /** + * @return Google_Service_CloudSearch_Date + */ + public function getDate() + { + return $this->date; + } + public function setOneDayActiveUsersCount($oneDayActiveUsersCount) + { + $this->oneDayActiveUsersCount = $oneDayActiveUsersCount; + } + public function getOneDayActiveUsersCount() + { + return $this->oneDayActiveUsersCount; + } + public function setSevenDaysActiveUsersCount($sevenDaysActiveUsersCount) + { + $this->sevenDaysActiveUsersCount = $sevenDaysActiveUsersCount; + } + public function getSevenDaysActiveUsersCount() + { + return $this->sevenDaysActiveUsersCount; + } + public function setThirtyDaysActiveUsersCount($thirtyDaysActiveUsersCount) + { + $this->thirtyDaysActiveUsersCount = $thirtyDaysActiveUsersCount; + } + public function getThirtyDaysActiveUsersCount() + { + return $this->thirtyDaysActiveUsersCount; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudTalentSolution.php b/vendor/google/apiclient-services/src/Google/Service/CloudTalentSolution.php index c267f85..aebb6a6 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudTalentSolution.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudTalentSolution.php @@ -73,20 +73,16 @@ class Google_Service_CloudTalentSolution extends Google_Service 'type' => 'string', 'required' => true, ), - 'type' => array( - 'location' => 'query', - 'type' => 'string', - ), 'languageCodes' => array( 'location' => 'query', 'type' => 'string', 'repeated' => true, ), - 'scope' => array( + 'companyName' => array( 'location' => 'query', 'type' => 'string', ), - 'companyName' => array( + 'scope' => array( 'location' => 'query', 'type' => 'string', ), @@ -102,6 +98,10 @@ class Google_Service_CloudTalentSolution extends Google_Service 'location' => 'query', 'type' => 'string', ), + 'type' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ), ) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudTalentSolution/Resource/Projects.php b/vendor/google/apiclient-services/src/Google/Service/CloudTalentSolution/Resource/Projects.php index 99c4d13..ae229bf 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudTalentSolution/Resource/Projects.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudTalentSolution/Resource/Projects.php @@ -36,8 +36,6 @@ class Google_Service_CloudTalentSolution_Resource_Projects extends Google_Servic * project". * @param array $optParams Optional parameters. * - * @opt_param string type Optional. The completion topic. The default is - * CompletionType.COMBINED. * @opt_param string languageCodes Optional. The list of languages of the query. * This is the BCP-47 language code, such as "en-US" or "sr-Latn". For more * information, see [Tags for Identifying @@ -53,13 +51,13 @@ class Google_Service_CloudTalentSolution_Resource_Projects extends Google_Servic * or companies having open jobs with the same language_codes are returned. * * The maximum number of allowed characters is 255. - * @opt_param string scope Optional. The scope of the completion. The defaults - * is CompletionScope.PUBLIC. * @opt_param string companyName Optional. If provided, restricts completion to * specified company. * * The format is "projects/{project_id}/companies/{company_id}", for example, * "projects/api-test-project/companies/foo". + * @opt_param string scope Optional. The scope of the completion. The defaults + * is CompletionScope.PUBLIC. * @opt_param int pageSize Required. Completion result count. * * The maximum allowed page size is 10. @@ -84,6 +82,8 @@ class Google_Service_CloudTalentSolution_Resource_Projects extends Google_Servic * or companies having open jobs with the same language_code are returned. * * The maximum number of allowed characters is 255. + * @opt_param string type Optional. The completion topic. The default is + * CompletionType.COMBINED. * @return Google_Service_CloudTalentSolution_CompleteQueryResponse */ public function complete($name, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudTasks.php b/vendor/google/apiclient-services/src/Google/Service/CloudTasks.php index 720d515..7240070 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudTasks.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudTasks.php @@ -150,10 +150,6 @@ class Google_Service_CloudTasks extends Google_Service 'type' => 'string', 'required' => true, ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -162,6 +158,10 @@ class Google_Service_CloudTasks extends Google_Service 'location' => 'query', 'type' => 'integer', ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'patch' => array( 'path' => 'v2/{+name}', diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudTasks/GetIamPolicyRequest.php b/vendor/google/apiclient-services/src/Google/Service/CloudTasks/GetIamPolicyRequest.php index 7091e04..83f704d 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudTasks/GetIamPolicyRequest.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudTasks/GetIamPolicyRequest.php @@ -17,4 +17,21 @@ class Google_Service_CloudTasks_GetIamPolicyRequest extends Google_Model { + protected $optionsType = 'Google_Service_CloudTasks_GetPolicyOptions'; + protected $optionsDataType = ''; + + /** + * @param Google_Service_CloudTasks_GetPolicyOptions + */ + public function setOptions(Google_Service_CloudTasks_GetPolicyOptions $options) + { + $this->options = $options; + } + /** + * @return Google_Service_CloudTasks_GetPolicyOptions + */ + public function getOptions() + { + return $this->options; + } } diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudTasks/GetPolicyOptions.php b/vendor/google/apiclient-services/src/Google/Service/CloudTasks/GetPolicyOptions.php new file mode 100644 index 0000000..bf679ef --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/CloudTasks/GetPolicyOptions.php @@ -0,0 +1,30 @@ +requestedPolicyVersion = $requestedPolicyVersion; + } + public function getRequestedPolicyVersion() + { + return $this->requestedPolicyVersion; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudTasks/Resource/ProjectsLocationsQueues.php b/vendor/google/apiclient-services/src/Google/Service/CloudTasks/Resource/ProjectsLocationsQueues.php index a7fcd5c..2b1572d 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudTasks/Resource/ProjectsLocationsQueues.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudTasks/Resource/ProjectsLocationsQueues.php @@ -38,10 +38,8 @@ class Google_Service_CloudTasks_Resource_ProjectsLocationsQueues extends Google_ * queue.yaml](https://cloud.google.com/tasks/docs/queue-yaml) before using this * method. (queues.create) * - * @param string $parent Required. - * - * The location name in which the queue will be created. For example: - * `projects/PROJECT_ID/locations/LOCATION_ID` + * @param string $parent Required. The location name in which the queue will be + * created. For example: `projects/PROJECT_ID/locations/LOCATION_ID` * * The list of allowed locations can be obtained by calling Cloud Tasks' * implementation of ListLocations. @@ -69,9 +67,7 @@ class Google_Service_CloudTasks_Resource_ProjectsLocationsQueues extends Google_ * queue.yaml](https://cloud.google.com/tasks/docs/queue-yaml) before using this * method. (queues.delete) * - * @param string $name Required. - * - * The queue name. For example: + * @param string $name Required. The queue name. For example: * `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID` * @param array $optParams Optional parameters. * @return Google_Service_CloudTasks_CloudtasksEmpty @@ -85,9 +81,7 @@ class Google_Service_CloudTasks_Resource_ProjectsLocationsQueues extends Google_ /** * Gets a queue. (queues.get) * - * @param string $name Required. - * - * The resource name of the queue. For example: + * @param string $name Required. The resource name of the queue. For example: * `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID` * @param array $optParams Optional parameters. * @return Google_Service_CloudTasks_Queue @@ -127,21 +121,10 @@ class Google_Service_CloudTasks_Resource_ProjectsLocationsQueues extends Google_ * Queues are returned in lexicographical order. * (queues.listProjectsLocationsQueues) * - * @param string $parent Required. - * - * The location name. For example: `projects/PROJECT_ID/locations/LOCATION_ID` + * @param string $parent Required. The location name. For example: + * `projects/PROJECT_ID/locations/LOCATION_ID` * @param array $optParams Optional parameters. * - * @opt_param string filter `filter` can be used to specify a subset of queues. - * Any Queue field can be used as a filter and several operators as supported. - * For example: `<=, <, >=, >, !=, =, :`. The filter syntax is the same as - * described in [Stackdriver's Advanced Logs - * Filters](https://cloud.google.com/logging/docs/view/advanced_filters). - * - * Sample filter "state: PAUSED". - * - * Note that using filters might cause fewer queues than the requested page_size - * to be returned. * @opt_param string pageToken A token identifying the page of results to * return. * @@ -155,6 +138,16 @@ class Google_Service_CloudTasks_Resource_ProjectsLocationsQueues extends Google_ * maximum. Fewer queues than requested might be returned, even if more queues * exist; use the next_page_token in the response to determine if more queues * exist. + * @opt_param string filter `filter` can be used to specify a subset of queues. + * Any Queue field can be used as a filter and several operators as supported. + * For example: `<=, <, >=, >, !=, =, :`. The filter syntax is the same as + * described in [Stackdriver's Advanced Logs + * Filters](https://cloud.google.com/logging/docs/view/advanced_filters). + * + * Sample filter "state: PAUSED". + * + * Note that using filters might cause fewer queues than the requested page_size + * to be returned. * @return Google_Service_CloudTasks_ListQueuesResponse */ public function listProjectsLocationsQueues($parent, $optParams = array()) @@ -218,9 +211,7 @@ class Google_Service_CloudTasks_Resource_ProjectsLocationsQueues extends Google_ * queue is resumed via ResumeQueue. Tasks can still be added when the queue is * paused. A queue is paused if its state is PAUSED. (queues.pause) * - * @param string $name Required. - * - * The queue name. For example: + * @param string $name Required. The queue name. For example: * `projects/PROJECT_ID/location/LOCATION_ID/queues/QUEUE_ID` * @param Google_Service_CloudTasks_PauseQueueRequest $postBody * @param array $optParams Optional parameters. @@ -241,9 +232,7 @@ class Google_Service_CloudTasks_Resource_ProjectsLocationsQueues extends Google_ * dispatched before the purge takes effect. A purge is irreversible. * (queues.purge) * - * @param string $name Required. - * - * The queue name. For example: + * @param string $name Required. The queue name. For example: * `projects/PROJECT_ID/location/LOCATION_ID/queues/QUEUE_ID` * @param Google_Service_CloudTasks_PurgeQueueRequest $postBody * @param array $optParams Optional parameters. @@ -268,9 +257,7 @@ class Google_Service_CloudTasks_Resource_ProjectsLocationsQueues extends Google_ * Risks](https://cloud.google.com/tasks/docs/manage-cloud-task-scaling). * (queues.resume) * - * @param string $name Required. - * - * The queue name. For example: + * @param string $name Required. The queue name. For example: * `projects/PROJECT_ID/location/LOCATION_ID/queues/QUEUE_ID` * @param Google_Service_CloudTasks_ResumeQueueRequest $postBody * @param array $optParams Optional parameters. diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudTasks/Resource/ProjectsLocationsQueuesTasks.php b/vendor/google/apiclient-services/src/Google/Service/CloudTasks/Resource/ProjectsLocationsQueuesTasks.php index d69f2ec..ac20c7a 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudTasks/Resource/ProjectsLocationsQueuesTasks.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudTasks/Resource/ProjectsLocationsQueuesTasks.php @@ -32,9 +32,7 @@ class Google_Service_CloudTasks_Resource_ProjectsLocationsQueuesTasks extends Go * * * The maximum task size is 100KB. (tasks.create) * - * @param string $parent Required. - * - * The queue name. For example: + * @param string $parent Required. The queue name. For example: * `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID` * * The queue must already exist. @@ -54,9 +52,7 @@ class Google_Service_CloudTasks_Resource_ProjectsLocationsQueuesTasks extends Go * A task can be deleted if it is scheduled or dispatched. A task cannot be * deleted if it has executed successfully or permanently failed. (tasks.delete) * - * @param string $name Required. - * - * The task name. For example: + * @param string $name Required. The task name. For example: * `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID/tasks/TASK_ID` * @param array $optParams Optional parameters. * @return Google_Service_CloudTasks_CloudtasksEmpty @@ -70,9 +66,7 @@ class Google_Service_CloudTasks_Resource_ProjectsLocationsQueuesTasks extends Go /** * Gets a task. (tasks.get) * - * @param string $name Required. - * - * The task name. For example: + * @param string $name Required. The task name. For example: * `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID/tasks/TASK_ID` * @param array $optParams Optional parameters. * @@ -104,9 +98,7 @@ class Google_Service_CloudTasks_Resource_ProjectsLocationsQueuesTasks extends Go * The tasks may be returned in any order. The ordering may change at any time. * (tasks.listProjectsLocationsQueuesTasks) * - * @param string $parent Required. - * - * The queue name. For example: + * @param string $parent Required. The queue name. For example: * `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID` * @param array $optParams Optional parameters. * @@ -165,9 +157,7 @@ class Google_Service_CloudTasks_Resource_ProjectsLocationsQueuesTasks extends Go * RunTask returns NOT_FOUND when it is called on a task that has already * succeeded or permanently failed. (tasks.run) * - * @param string $name Required. - * - * The task name. For example: + * @param string $name Required. The task name. For example: * `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID/tasks/TASK_ID` * @param Google_Service_CloudTasks_RunTaskRequest $postBody * @param array $optParams Optional parameters. diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudTrace/Span.php b/vendor/google/apiclient-services/src/Google/Service/CloudTrace/Span.php index ccf4e0f..7a45f01 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudTrace/Span.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudTrace/Span.php @@ -29,6 +29,7 @@ class Google_Service_CloudTrace_Span extends Google_Model public $parentSpanId; public $sameProcessAsParentSpan; public $spanId; + public $spanKind; protected $stackTraceType = 'Google_Service_CloudTrace_StackTrace'; protected $stackTraceDataType = ''; public $startTime; @@ -127,6 +128,14 @@ class Google_Service_CloudTrace_Span extends Google_Model { return $this->spanId; } + public function setSpanKind($spanKind) + { + $this->spanKind = $spanKind; + } + public function getSpanKind() + { + return $this->spanKind; + } /** * @param Google_Service_CloudTrace_StackTrace */ diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudVideoIntelligence.php b/vendor/google/apiclient-services/src/Google/Service/CloudVideoIntelligence.php index b3b356c..aa620ee 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudVideoIntelligence.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudVideoIntelligence.php @@ -141,6 +141,10 @@ class Google_Service_CloudVideoIntelligence extends Google_Service 'type' => 'string', 'required' => true, ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -149,10 +153,6 @@ class Google_Service_CloudVideoIntelligence extends Google_Service 'location' => 'query', 'type' => 'integer', ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), ), ), ) diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudVideoIntelligence/GoogleCloudVideointelligenceV1VideoAnnotationResults.php b/vendor/google/apiclient-services/src/Google/Service/CloudVideoIntelligence/GoogleCloudVideointelligenceV1VideoAnnotationResults.php index e73b203..93e2f9d 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudVideoIntelligence/GoogleCloudVideointelligenceV1VideoAnnotationResults.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudVideoIntelligence/GoogleCloudVideointelligenceV1VideoAnnotationResults.php @@ -31,10 +31,14 @@ class Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1VideoA protected $segmentDataType = ''; protected $segmentLabelAnnotationsType = 'Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1LabelAnnotation'; protected $segmentLabelAnnotationsDataType = 'array'; + protected $segmentPresenceLabelAnnotationsType = 'Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1LabelAnnotation'; + protected $segmentPresenceLabelAnnotationsDataType = 'array'; protected $shotAnnotationsType = 'Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1VideoSegment'; protected $shotAnnotationsDataType = 'array'; protected $shotLabelAnnotationsType = 'Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1LabelAnnotation'; protected $shotLabelAnnotationsDataType = 'array'; + protected $shotPresenceLabelAnnotationsType = 'Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1LabelAnnotation'; + protected $shotPresenceLabelAnnotationsDataType = 'array'; protected $speechTranscriptionsType = 'Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1SpeechTranscription'; protected $speechTranscriptionsDataType = 'array'; protected $textAnnotationsType = 'Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1TextAnnotation'; @@ -132,6 +136,20 @@ class Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1VideoA { return $this->segmentLabelAnnotations; } + /** + * @param Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1LabelAnnotation + */ + public function setSegmentPresenceLabelAnnotations($segmentPresenceLabelAnnotations) + { + $this->segmentPresenceLabelAnnotations = $segmentPresenceLabelAnnotations; + } + /** + * @return Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1LabelAnnotation + */ + public function getSegmentPresenceLabelAnnotations() + { + return $this->segmentPresenceLabelAnnotations; + } /** * @param Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1VideoSegment */ @@ -160,6 +178,20 @@ class Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1VideoA { return $this->shotLabelAnnotations; } + /** + * @param Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1LabelAnnotation + */ + public function setShotPresenceLabelAnnotations($shotPresenceLabelAnnotations) + { + $this->shotPresenceLabelAnnotations = $shotPresenceLabelAnnotations; + } + /** + * @return Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1LabelAnnotation + */ + public function getShotPresenceLabelAnnotations() + { + return $this->shotPresenceLabelAnnotations; + } /** * @param Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1SpeechTranscription */ diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudVideoIntelligence/GoogleCloudVideointelligenceV1beta2VideoAnnotationResults.php b/vendor/google/apiclient-services/src/Google/Service/CloudVideoIntelligence/GoogleCloudVideointelligenceV1beta2VideoAnnotationResults.php index 09a5339..eb54319 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudVideoIntelligence/GoogleCloudVideointelligenceV1beta2VideoAnnotationResults.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudVideoIntelligence/GoogleCloudVideointelligenceV1beta2VideoAnnotationResults.php @@ -31,10 +31,14 @@ class Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1beta2V protected $segmentDataType = ''; protected $segmentLabelAnnotationsType = 'Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1beta2LabelAnnotation'; protected $segmentLabelAnnotationsDataType = 'array'; + protected $segmentPresenceLabelAnnotationsType = 'Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1beta2LabelAnnotation'; + protected $segmentPresenceLabelAnnotationsDataType = 'array'; protected $shotAnnotationsType = 'Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1beta2VideoSegment'; protected $shotAnnotationsDataType = 'array'; protected $shotLabelAnnotationsType = 'Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1beta2LabelAnnotation'; protected $shotLabelAnnotationsDataType = 'array'; + protected $shotPresenceLabelAnnotationsType = 'Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1beta2LabelAnnotation'; + protected $shotPresenceLabelAnnotationsDataType = 'array'; protected $speechTranscriptionsType = 'Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1beta2SpeechTranscription'; protected $speechTranscriptionsDataType = 'array'; protected $textAnnotationsType = 'Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1beta2TextAnnotation'; @@ -132,6 +136,20 @@ class Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1beta2V { return $this->segmentLabelAnnotations; } + /** + * @param Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1beta2LabelAnnotation + */ + public function setSegmentPresenceLabelAnnotations($segmentPresenceLabelAnnotations) + { + $this->segmentPresenceLabelAnnotations = $segmentPresenceLabelAnnotations; + } + /** + * @return Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1beta2LabelAnnotation + */ + public function getSegmentPresenceLabelAnnotations() + { + return $this->segmentPresenceLabelAnnotations; + } /** * @param Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1beta2VideoSegment */ @@ -160,6 +178,20 @@ class Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1beta2V { return $this->shotLabelAnnotations; } + /** + * @param Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1beta2LabelAnnotation + */ + public function setShotPresenceLabelAnnotations($shotPresenceLabelAnnotations) + { + $this->shotPresenceLabelAnnotations = $shotPresenceLabelAnnotations; + } + /** + * @return Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1beta2LabelAnnotation + */ + public function getShotPresenceLabelAnnotations() + { + return $this->shotPresenceLabelAnnotations; + } /** * @param Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1beta2SpeechTranscription */ diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudVideoIntelligence/GoogleCloudVideointelligenceV1p1beta1VideoAnnotationResults.php b/vendor/google/apiclient-services/src/Google/Service/CloudVideoIntelligence/GoogleCloudVideointelligenceV1p1beta1VideoAnnotationResults.php index 25208a5..b8dd823 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudVideoIntelligence/GoogleCloudVideointelligenceV1p1beta1VideoAnnotationResults.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudVideoIntelligence/GoogleCloudVideointelligenceV1p1beta1VideoAnnotationResults.php @@ -31,10 +31,14 @@ class Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p1beta protected $segmentDataType = ''; protected $segmentLabelAnnotationsType = 'Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p1beta1LabelAnnotation'; protected $segmentLabelAnnotationsDataType = 'array'; + protected $segmentPresenceLabelAnnotationsType = 'Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p1beta1LabelAnnotation'; + protected $segmentPresenceLabelAnnotationsDataType = 'array'; protected $shotAnnotationsType = 'Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p1beta1VideoSegment'; protected $shotAnnotationsDataType = 'array'; protected $shotLabelAnnotationsType = 'Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p1beta1LabelAnnotation'; protected $shotLabelAnnotationsDataType = 'array'; + protected $shotPresenceLabelAnnotationsType = 'Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p1beta1LabelAnnotation'; + protected $shotPresenceLabelAnnotationsDataType = 'array'; protected $speechTranscriptionsType = 'Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p1beta1SpeechTranscription'; protected $speechTranscriptionsDataType = 'array'; protected $textAnnotationsType = 'Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p1beta1TextAnnotation'; @@ -132,6 +136,20 @@ class Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p1beta { return $this->segmentLabelAnnotations; } + /** + * @param Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p1beta1LabelAnnotation + */ + public function setSegmentPresenceLabelAnnotations($segmentPresenceLabelAnnotations) + { + $this->segmentPresenceLabelAnnotations = $segmentPresenceLabelAnnotations; + } + /** + * @return Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p1beta1LabelAnnotation + */ + public function getSegmentPresenceLabelAnnotations() + { + return $this->segmentPresenceLabelAnnotations; + } /** * @param Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p1beta1VideoSegment */ @@ -160,6 +178,20 @@ class Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p1beta { return $this->shotLabelAnnotations; } + /** + * @param Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p1beta1LabelAnnotation + */ + public function setShotPresenceLabelAnnotations($shotPresenceLabelAnnotations) + { + $this->shotPresenceLabelAnnotations = $shotPresenceLabelAnnotations; + } + /** + * @return Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p1beta1LabelAnnotation + */ + public function getShotPresenceLabelAnnotations() + { + return $this->shotPresenceLabelAnnotations; + } /** * @param Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p1beta1SpeechTranscription */ diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudVideoIntelligence/GoogleCloudVideointelligenceV1p2beta1VideoAnnotationResults.php b/vendor/google/apiclient-services/src/Google/Service/CloudVideoIntelligence/GoogleCloudVideointelligenceV1p2beta1VideoAnnotationResults.php index 3f6bf77..e91ab33 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudVideoIntelligence/GoogleCloudVideointelligenceV1p2beta1VideoAnnotationResults.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudVideoIntelligence/GoogleCloudVideointelligenceV1p2beta1VideoAnnotationResults.php @@ -31,10 +31,14 @@ class Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p2beta protected $segmentDataType = ''; protected $segmentLabelAnnotationsType = 'Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p2beta1LabelAnnotation'; protected $segmentLabelAnnotationsDataType = 'array'; + protected $segmentPresenceLabelAnnotationsType = 'Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p2beta1LabelAnnotation'; + protected $segmentPresenceLabelAnnotationsDataType = 'array'; protected $shotAnnotationsType = 'Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p2beta1VideoSegment'; protected $shotAnnotationsDataType = 'array'; protected $shotLabelAnnotationsType = 'Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p2beta1LabelAnnotation'; protected $shotLabelAnnotationsDataType = 'array'; + protected $shotPresenceLabelAnnotationsType = 'Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p2beta1LabelAnnotation'; + protected $shotPresenceLabelAnnotationsDataType = 'array'; protected $speechTranscriptionsType = 'Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p2beta1SpeechTranscription'; protected $speechTranscriptionsDataType = 'array'; protected $textAnnotationsType = 'Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p2beta1TextAnnotation'; @@ -132,6 +136,20 @@ class Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p2beta { return $this->segmentLabelAnnotations; } + /** + * @param Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p2beta1LabelAnnotation + */ + public function setSegmentPresenceLabelAnnotations($segmentPresenceLabelAnnotations) + { + $this->segmentPresenceLabelAnnotations = $segmentPresenceLabelAnnotations; + } + /** + * @return Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p2beta1LabelAnnotation + */ + public function getSegmentPresenceLabelAnnotations() + { + return $this->segmentPresenceLabelAnnotations; + } /** * @param Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p2beta1VideoSegment */ @@ -160,6 +178,20 @@ class Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p2beta { return $this->shotLabelAnnotations; } + /** + * @param Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p2beta1LabelAnnotation + */ + public function setShotPresenceLabelAnnotations($shotPresenceLabelAnnotations) + { + $this->shotPresenceLabelAnnotations = $shotPresenceLabelAnnotations; + } + /** + * @return Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p2beta1LabelAnnotation + */ + public function getShotPresenceLabelAnnotations() + { + return $this->shotPresenceLabelAnnotations; + } /** * @param Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p2beta1SpeechTranscription */ diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudVideoIntelligence/GoogleCloudVideointelligenceV1p3beta1VideoAnnotationResults.php b/vendor/google/apiclient-services/src/Google/Service/CloudVideoIntelligence/GoogleCloudVideointelligenceV1p3beta1VideoAnnotationResults.php index 03b70eb..32b8710 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudVideoIntelligence/GoogleCloudVideointelligenceV1p3beta1VideoAnnotationResults.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudVideoIntelligence/GoogleCloudVideointelligenceV1p3beta1VideoAnnotationResults.php @@ -33,10 +33,14 @@ class Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p3beta protected $segmentDataType = ''; protected $segmentLabelAnnotationsType = 'Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p3beta1LabelAnnotation'; protected $segmentLabelAnnotationsDataType = 'array'; + protected $segmentPresenceLabelAnnotationsType = 'Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p3beta1LabelAnnotation'; + protected $segmentPresenceLabelAnnotationsDataType = 'array'; protected $shotAnnotationsType = 'Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p3beta1VideoSegment'; protected $shotAnnotationsDataType = 'array'; protected $shotLabelAnnotationsType = 'Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p3beta1LabelAnnotation'; protected $shotLabelAnnotationsDataType = 'array'; + protected $shotPresenceLabelAnnotationsType = 'Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p3beta1LabelAnnotation'; + protected $shotPresenceLabelAnnotationsDataType = 'array'; protected $speechTranscriptionsType = 'Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p3beta1SpeechTranscription'; protected $speechTranscriptionsDataType = 'array'; protected $textAnnotationsType = 'Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p3beta1TextAnnotation'; @@ -148,6 +152,20 @@ class Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p3beta { return $this->segmentLabelAnnotations; } + /** + * @param Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p3beta1LabelAnnotation + */ + public function setSegmentPresenceLabelAnnotations($segmentPresenceLabelAnnotations) + { + $this->segmentPresenceLabelAnnotations = $segmentPresenceLabelAnnotations; + } + /** + * @return Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p3beta1LabelAnnotation + */ + public function getSegmentPresenceLabelAnnotations() + { + return $this->segmentPresenceLabelAnnotations; + } /** * @param Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p3beta1VideoSegment */ @@ -176,6 +194,20 @@ class Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p3beta { return $this->shotLabelAnnotations; } + /** + * @param Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p3beta1LabelAnnotation + */ + public function setShotPresenceLabelAnnotations($shotPresenceLabelAnnotations) + { + $this->shotPresenceLabelAnnotations = $shotPresenceLabelAnnotations; + } + /** + * @return Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p3beta1LabelAnnotation + */ + public function getShotPresenceLabelAnnotations() + { + return $this->shotPresenceLabelAnnotations; + } /** * @param Google_Service_CloudVideoIntelligence_GoogleCloudVideointelligenceV1p3beta1SpeechTranscription */ diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudVideoIntelligence/Resource/ProjectsLocationsOperations.php b/vendor/google/apiclient-services/src/Google/Service/CloudVideoIntelligence/Resource/ProjectsLocationsOperations.php index 3ce0a75..663e02c 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudVideoIntelligence/Resource/ProjectsLocationsOperations.php +++ b/vendor/google/apiclient-services/src/Google/Service/CloudVideoIntelligence/Resource/ProjectsLocationsOperations.php @@ -94,9 +94,9 @@ class Google_Service_CloudVideoIntelligence_Resource_ProjectsLocationsOperations * @param string $name The name of the operation's parent resource. * @param array $optParams Optional parameters. * + * @opt_param string filter The standard list filter. * @opt_param string pageToken The standard list page token. * @opt_param int pageSize The standard list page size. - * @opt_param string filter The standard list filter. * @return Google_Service_CloudVideoIntelligence_GoogleLongrunningListOperationsResponse */ public function listProjectsLocationsOperations($name, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Cloudbilling/AuditLogConfig.php b/vendor/google/apiclient-services/src/Google/Service/Cloudbilling/AuditLogConfig.php index a509956..f0c91e8 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Cloudbilling/AuditLogConfig.php +++ b/vendor/google/apiclient-services/src/Google/Service/Cloudbilling/AuditLogConfig.php @@ -19,7 +19,6 @@ class Google_Service_Cloudbilling_AuditLogConfig extends Google_Collection { protected $collection_key = 'exemptedMembers'; public $exemptedMembers; - public $ignoreChildExemptions; public $logType; public function setExemptedMembers($exemptedMembers) @@ -30,14 +29,6 @@ class Google_Service_Cloudbilling_AuditLogConfig extends Google_Collection { return $this->exemptedMembers; } - public function setIgnoreChildExemptions($ignoreChildExemptions) - { - $this->ignoreChildExemptions = $ignoreChildExemptions; - } - public function getIgnoreChildExemptions() - { - return $this->ignoreChildExemptions; - } public function setLogType($logType) { $this->logType = $logType; diff --git a/vendor/google/apiclient-services/src/Google/Service/Cloudbilling/Resource/BillingAccounts.php b/vendor/google/apiclient-services/src/Google/Service/Cloudbilling/Resource/BillingAccounts.php index 812116b..c69e989 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Cloudbilling/Resource/BillingAccounts.php +++ b/vendor/google/apiclient-services/src/Google/Service/Cloudbilling/Resource/BillingAccounts.php @@ -73,8 +73,14 @@ class Google_Service_Cloudbilling_Resource_BillingAccounts extends Google_Servic * @param array $optParams Optional parameters. * * @opt_param int options.requestedPolicyVersion Optional. The policy format - * version to be returned. Acceptable values are 0, 1, and 3. If the value is 0, - * or the field is omitted, policy format version 1 will be returned. + * version to be returned. + * + * Valid values are 0, 1, and 3. Requests specifying an invalid value will be + * rejected. + * + * Requests for policies with any conditional bindings must specify version 3. + * Policies without any conditional bindings may specify any valid value or + * leave the field unset. * @return Google_Service_Cloudbilling_Policy */ public function getIamPolicy($resource, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Clouderrorreporting.php b/vendor/google/apiclient-services/src/Google/Service/Clouderrorreporting.php index a8b171f..ca23a9a 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Clouderrorreporting.php +++ b/vendor/google/apiclient-services/src/Google/Service/Clouderrorreporting.php @@ -91,14 +91,6 @@ class Google_Service_Clouderrorreporting extends Google_Service 'type' => 'string', 'required' => true, ), - 'serviceFilter.version' => array( - 'location' => 'query', - 'type' => 'string', - ), - 'serviceFilter.resourceType' => array( - 'location' => 'query', - 'type' => 'string', - ), 'timeRange.period' => array( 'location' => 'query', 'type' => 'string', @@ -107,11 +99,11 @@ class Google_Service_Clouderrorreporting extends Google_Service 'location' => 'query', 'type' => 'string', ), - 'serviceFilter.service' => array( + 'pageToken' => array( 'location' => 'query', 'type' => 'string', ), - 'pageToken' => array( + 'serviceFilter.service' => array( 'location' => 'query', 'type' => 'string', ), @@ -119,6 +111,14 @@ class Google_Service_Clouderrorreporting extends Google_Service 'location' => 'query', 'type' => 'integer', ), + 'serviceFilter.version' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'serviceFilter.resourceType' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'report' => array( 'path' => 'v1beta1/{+projectName}/events:report', @@ -149,6 +149,22 @@ class Google_Service_Clouderrorreporting extends Google_Service 'type' => 'string', 'required' => true, ), + 'serviceFilter.resourceType' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'alignmentTime' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'timedCountDuration' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), 'timeRange.period' => array( 'location' => 'query', 'type' => 'string', @@ -170,27 +186,11 @@ class Google_Service_Clouderrorreporting extends Google_Service 'location' => 'query', 'type' => 'integer', ), - 'serviceFilter.version' => array( - 'location' => 'query', - 'type' => 'string', - ), 'order' => array( 'location' => 'query', 'type' => 'string', ), - 'serviceFilter.resourceType' => array( - 'location' => 'query', - 'type' => 'string', - ), - 'alignmentTime' => array( - 'location' => 'query', - 'type' => 'string', - ), - 'timedCountDuration' => array( - 'location' => 'query', - 'type' => 'string', - ), - 'pageToken' => array( + 'serviceFilter.version' => array( 'location' => 'query', 'type' => 'string', ), diff --git a/vendor/google/apiclient-services/src/Google/Service/Clouderrorreporting/Resource/Projects.php b/vendor/google/apiclient-services/src/Google/Service/Clouderrorreporting/Resource/Projects.php index bcf8e25..ca2d720 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Clouderrorreporting/Resource/Projects.php +++ b/vendor/google/apiclient-services/src/Google/Service/Clouderrorreporting/Resource/Projects.php @@ -28,7 +28,7 @@ class Google_Service_Clouderrorreporting_Resource_Projects extends Google_Servic /** * Deletes all error events of a given project. (projects.deleteEvents) * - * @param string $projectName [Required] The resource name of the Google Cloud + * @param string $projectName Required. The resource name of the Google Cloud * Platform project. Written as `projects/` plus the [Google Cloud Platform * project ID](https://support.google.com/cloud/answer/6158840). Example: * `projects/my-project-123`. diff --git a/vendor/google/apiclient-services/src/Google/Service/Clouderrorreporting/Resource/ProjectsEvents.php b/vendor/google/apiclient-services/src/Google/Service/Clouderrorreporting/Resource/ProjectsEvents.php index 3e1a52a..cc8f31c 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Clouderrorreporting/Resource/ProjectsEvents.php +++ b/vendor/google/apiclient-services/src/Google/Service/Clouderrorreporting/Resource/ProjectsEvents.php @@ -28,29 +28,29 @@ class Google_Service_Clouderrorreporting_Resource_ProjectsEvents extends Google_ /** * Lists the specified events. (events.listProjectsEvents) * - * @param string $projectName [Required] The resource name of the Google Cloud + * @param string $projectName Required. The resource name of the Google Cloud * Platform project. Written as `projects/` plus the [Google Cloud Platform * project ID](https://support.google.com/cloud/answer/6158840). Example: * `projects/my-project-123`. * @param array $optParams Optional parameters. * - * @opt_param string serviceFilter.version [Optional] The exact value to match - * against [`ServiceContext.version`](/error- - * reporting/reference/rest/v1beta1/ServiceContext#FIELDS.version). - * @opt_param string serviceFilter.resourceType [Optional] The exact value to - * match against [`ServiceContext.resource_type`](/error- - * reporting/reference/rest/v1beta1/ServiceContext#FIELDS.resource_type). * @opt_param string timeRange.period Restricts the query to the specified time * range. - * @opt_param string groupId [Required] The group for which events shall be + * @opt_param string groupId Required. The group for which events shall be * returned. - * @opt_param string serviceFilter.service [Optional] The exact value to match + * @opt_param string pageToken Optional. A `next_page_token` provided by a + * previous response. + * @opt_param string serviceFilter.service Optional. The exact value to match * against [`ServiceContext.service`](/error- * reporting/reference/rest/v1beta1/ServiceContext#FIELDS.service). - * @opt_param string pageToken [Optional] A `next_page_token` provided by a - * previous response. - * @opt_param int pageSize [Optional] The maximum number of results to return - * per response. + * @opt_param int pageSize Optional. The maximum number of results to return per + * response. + * @opt_param string serviceFilter.version Optional. The exact value to match + * against [`ServiceContext.version`](/error- + * reporting/reference/rest/v1beta1/ServiceContext#FIELDS.version). + * @opt_param string serviceFilter.resourceType Optional. The exact value to + * match against [`ServiceContext.resource_type`](/error- + * reporting/reference/rest/v1beta1/ServiceContext#FIELDS.resource_type). * @return Google_Service_Clouderrorreporting_ListEventsResponse */ public function listProjectsEvents($projectName, $optParams = array()) @@ -70,7 +70,7 @@ class Google_Service_Clouderrorreporting_Resource_ProjectsEvents extends Google_ * `POST https://clouderrorreporting.googleapis.com/v1beta1/projects/example- * project/events:report?key=123ABC456` (events.report) * - * @param string $projectName [Required] The resource name of the Google Cloud + * @param string $projectName Required. The resource name of the Google Cloud * Platform project. Written as `projects/` plus the [Google Cloud Platform * project ID](https://support.google.com/cloud/answer/6158840). Example: * `projects/my-project-123`. diff --git a/vendor/google/apiclient-services/src/Google/Service/Clouderrorreporting/Resource/ProjectsGroupStats.php b/vendor/google/apiclient-services/src/Google/Service/Clouderrorreporting/Resource/ProjectsGroupStats.php index e2f9a28..6ed81e8 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Clouderrorreporting/Resource/ProjectsGroupStats.php +++ b/vendor/google/apiclient-services/src/Google/Service/Clouderrorreporting/Resource/ProjectsGroupStats.php @@ -28,38 +28,38 @@ class Google_Service_Clouderrorreporting_Resource_ProjectsGroupStats extends Goo /** * Lists the specified groups. (groupStats.listProjectsGroupStats) * - * @param string $projectName [Required] The resource name of the Google Cloud + * @param string $projectName Required. The resource name of the Google Cloud * Platform project. Written as projects/ plus the Google Cloud Platform project * ID. * * Example: projects/my-project-123. * @param array $optParams Optional parameters. * - * @opt_param string timeRange.period Restricts the query to the specified time - * range. - * @opt_param string alignment [Optional] The alignment of the timed counts to - * be returned. Default is `ALIGNMENT_EQUAL_AT_END`. - * @opt_param string groupId [Optional] List all ErrorGroupStats with these IDs. - * @opt_param string serviceFilter.service [Optional] The exact value to match - * against [`ServiceContext.service`](/error- - * reporting/reference/rest/v1beta1/ServiceContext#FIELDS.service). - * @opt_param int pageSize [Optional] The maximum number of results to return - * per response. Default is 20. - * @opt_param string serviceFilter.version [Optional] The exact value to match - * against [`ServiceContext.version`](/error- - * reporting/reference/rest/v1beta1/ServiceContext#FIELDS.version). - * @opt_param string order [Optional] The sort order in which the results are - * returned. Default is `COUNT_DESC`. - * @opt_param string serviceFilter.resourceType [Optional] The exact value to + * @opt_param string serviceFilter.resourceType Optional. The exact value to * match against [`ServiceContext.resource_type`](/error- * reporting/reference/rest/v1beta1/ServiceContext#FIELDS.resource_type). - * @opt_param string alignmentTime [Optional] Time where the timed counts shall + * @opt_param string alignmentTime Optional. Time where the timed counts shall * be aligned if rounded alignment is chosen. Default is 00:00 UTC. - * @opt_param string timedCountDuration [Optional] The preferred duration for a + * @opt_param string timedCountDuration Optional. The preferred duration for a * single returned `TimedCount`. If not set, no timed counts are returned. - * @opt_param string pageToken [Optional] A `next_page_token` provided by a + * @opt_param string pageToken Optional. A `next_page_token` provided by a * previous response. To view additional results, pass this token along with the * identical query parameters as the first request. + * @opt_param string timeRange.period Restricts the query to the specified time + * range. + * @opt_param string alignment Optional. The alignment of the timed counts to be + * returned. Default is `ALIGNMENT_EQUAL_AT_END`. + * @opt_param string groupId Optional. List all ErrorGroupStats with these IDs. + * @opt_param string serviceFilter.service Optional. The exact value to match + * against [`ServiceContext.service`](/error- + * reporting/reference/rest/v1beta1/ServiceContext#FIELDS.service). + * @opt_param int pageSize Optional. The maximum number of results to return per + * response. Default is 20. + * @opt_param string order Optional. The sort order in which the results are + * returned. Default is `COUNT_DESC`. + * @opt_param string serviceFilter.version Optional. The exact value to match + * against [`ServiceContext.version`](/error- + * reporting/reference/rest/v1beta1/ServiceContext#FIELDS.version). * @return Google_Service_Clouderrorreporting_ListGroupStatsResponse */ public function listProjectsGroupStats($projectName, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Clouderrorreporting/Resource/ProjectsGroups.php b/vendor/google/apiclient-services/src/Google/Service/Clouderrorreporting/Resource/ProjectsGroups.php index 1db6cc3..b80b1ce 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Clouderrorreporting/Resource/ProjectsGroups.php +++ b/vendor/google/apiclient-services/src/Google/Service/Clouderrorreporting/Resource/ProjectsGroups.php @@ -28,7 +28,7 @@ class Google_Service_Clouderrorreporting_Resource_ProjectsGroups extends Google_ /** * Get the specified group. (groups.get) * - * @param string $groupName [Required] The group resource name. Written as + * @param string $groupName Required. The group resource name. Written as * projects/projectID/groups/group_name. Call * * groupStats.list to return a list of groups belonging to this project. diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute.php b/vendor/google/apiclient-services/src/Google/Service/Compute.php index b48386a..06a6b27 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Compute.php +++ b/vendor/google/apiclient-services/src/Google/Service/Compute.php @@ -56,6 +56,7 @@ class Google_Service_Compute extends Google_Service public $backendServices; public $diskTypes; public $disks; + public $externalVpnGateways; public $firewalls; public $forwardingRules; public $globalAddresses; @@ -86,9 +87,14 @@ class Google_Service_Compute extends Google_Service public $regionCommitments; public $regionDiskTypes; public $regionDisks; + public $regionHealthChecks; public $regionInstanceGroupManagers; public $regionInstanceGroups; public $regionOperations; + public $regionSslCertificates; + public $regionTargetHttpProxies; + public $regionTargetHttpsProxies; + public $regionUrlMaps; public $regions; public $reservations; public $resourcePolicies; @@ -107,6 +113,7 @@ class Google_Service_Compute extends Google_Service public $targetTcpProxies; public $targetVpnGateways; public $urlMaps; + public $vpnGateways; public $vpnTunnels; public $zoneOperations; public $zones; @@ -120,7 +127,7 @@ class Google_Service_Compute extends Google_Service public function __construct(Google_Client $client, $rootUrl = null) { parent::__construct($client); - $this->rootUrl = $rootUrl ?: 'https://www.googleapis.com/'; + $this->rootUrl = $rootUrl ?: 'https://compute.googleapis.com/'; $this->servicePath = 'compute/v1/projects/'; $this->batchPath = 'batch/compute/v1'; $this->version = 'v1'; @@ -1314,6 +1321,120 @@ class Google_Service_Compute extends Google_Service ) ) ); + $this->externalVpnGateways = new Google_Service_Compute_Resource_ExternalVpnGateways( + $this, + $this->serviceName, + 'externalVpnGateways', + array( + 'methods' => array( + 'delete' => array( + 'path' => '{project}/global/externalVpnGateways/{externalVpnGateway}', + 'httpMethod' => 'DELETE', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'externalVpnGateway' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'requestId' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'get' => array( + 'path' => '{project}/global/externalVpnGateways/{externalVpnGateway}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'externalVpnGateway' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'insert' => array( + 'path' => '{project}/global/externalVpnGateways', + 'httpMethod' => 'POST', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'requestId' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'list' => array( + 'path' => '{project}/global/externalVpnGateways', + 'httpMethod' => 'GET', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'maxResults' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'orderBy' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'setLabels' => array( + 'path' => '{project}/global/externalVpnGateways/{resource}/setLabels', + 'httpMethod' => 'POST', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'resource' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'testIamPermissions' => array( + 'path' => '{project}/global/externalVpnGateways/{resource}/testIamPermissions', + 'httpMethod' => 'POST', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'resource' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ), + ) + ) + ); $this->firewalls = new Google_Service_Compute_Resource_Firewalls( $this, $this->serviceName, @@ -1875,7 +1996,33 @@ class Google_Service_Compute extends Google_Service 'healthChecks', array( 'methods' => array( - 'delete' => array( + 'aggregatedList' => array( + 'path' => '{project}/aggregated/healthChecks', + 'httpMethod' => 'GET', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'maxResults' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'orderBy' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'delete' => array( 'path' => '{project}/global/healthChecks/{healthCheck}', 'httpMethod' => 'DELETE', 'parameters' => array( @@ -3968,6 +4115,30 @@ class Google_Service_Compute extends Google_Service 'type' => 'string', ), ), + ),'updateDisplayDevice' => array( + 'path' => '{project}/zones/{zone}/instances/{instance}/updateDisplayDevice', + 'httpMethod' => 'PATCH', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'zone' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'instance' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'requestId' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), ),'updateNetworkInterface' => array( 'path' => '{project}/zones/{zone}/instances/{instance}/updateNetworkInterface', 'httpMethod' => 'PATCH', @@ -4994,6 +5165,25 @@ class Google_Service_Compute extends Google_Service 'type' => 'string', ), ), + ),'updatePeering' => array( + 'path' => '{project}/global/networks/{network}/updatePeering', + 'httpMethod' => 'PATCH', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'network' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'requestId' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), ), ) ) @@ -6523,6 +6713,158 @@ class Google_Service_Compute extends Google_Service ) ) ); + $this->regionHealthChecks = new Google_Service_Compute_Resource_RegionHealthChecks( + $this, + $this->serviceName, + 'regionHealthChecks', + array( + 'methods' => array( + 'delete' => array( + 'path' => '{project}/regions/{region}/healthChecks/{healthCheck}', + 'httpMethod' => 'DELETE', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'region' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'healthCheck' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'requestId' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'get' => array( + 'path' => '{project}/regions/{region}/healthChecks/{healthCheck}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'region' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'healthCheck' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'insert' => array( + 'path' => '{project}/regions/{region}/healthChecks', + 'httpMethod' => 'POST', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'region' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'requestId' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'list' => array( + 'path' => '{project}/regions/{region}/healthChecks', + 'httpMethod' => 'GET', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'region' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'maxResults' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'orderBy' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'patch' => array( + 'path' => '{project}/regions/{region}/healthChecks/{healthCheck}', + 'httpMethod' => 'PATCH', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'region' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'healthCheck' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'requestId' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'update' => array( + 'path' => '{project}/regions/{region}/healthChecks/{healthCheck}', + 'httpMethod' => 'PUT', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'region' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'healthCheck' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'requestId' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ), + ) + ) + ); $this->regionInstanceGroupManagers = new Google_Service_Compute_Resource_RegionInstanceGroupManagers( $this, $this->serviceName, @@ -7038,6 +7380,562 @@ class Google_Service_Compute extends Google_Service ) ) ); + $this->regionSslCertificates = new Google_Service_Compute_Resource_RegionSslCertificates( + $this, + $this->serviceName, + 'regionSslCertificates', + array( + 'methods' => array( + 'delete' => array( + 'path' => '{project}/regions/{region}/sslCertificates/{sslCertificate}', + 'httpMethod' => 'DELETE', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'region' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'sslCertificate' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'requestId' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'get' => array( + 'path' => '{project}/regions/{region}/sslCertificates/{sslCertificate}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'region' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'sslCertificate' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'insert' => array( + 'path' => '{project}/regions/{region}/sslCertificates', + 'httpMethod' => 'POST', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'region' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'requestId' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'list' => array( + 'path' => '{project}/regions/{region}/sslCertificates', + 'httpMethod' => 'GET', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'region' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'maxResults' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'orderBy' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ), + ) + ) + ); + $this->regionTargetHttpProxies = new Google_Service_Compute_Resource_RegionTargetHttpProxies( + $this, + $this->serviceName, + 'regionTargetHttpProxies', + array( + 'methods' => array( + 'delete' => array( + 'path' => '{project}/regions/{region}/targetHttpProxies/{targetHttpProxy}', + 'httpMethod' => 'DELETE', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'region' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'targetHttpProxy' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'requestId' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'get' => array( + 'path' => '{project}/regions/{region}/targetHttpProxies/{targetHttpProxy}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'region' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'targetHttpProxy' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'insert' => array( + 'path' => '{project}/regions/{region}/targetHttpProxies', + 'httpMethod' => 'POST', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'region' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'requestId' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'list' => array( + 'path' => '{project}/regions/{region}/targetHttpProxies', + 'httpMethod' => 'GET', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'region' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'maxResults' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'orderBy' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'setUrlMap' => array( + 'path' => '{project}/regions/{region}/targetHttpProxies/{targetHttpProxy}/setUrlMap', + 'httpMethod' => 'POST', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'region' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'targetHttpProxy' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'requestId' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ), + ) + ) + ); + $this->regionTargetHttpsProxies = new Google_Service_Compute_Resource_RegionTargetHttpsProxies( + $this, + $this->serviceName, + 'regionTargetHttpsProxies', + array( + 'methods' => array( + 'delete' => array( + 'path' => '{project}/regions/{region}/targetHttpsProxies/{targetHttpsProxy}', + 'httpMethod' => 'DELETE', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'region' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'targetHttpsProxy' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'requestId' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'get' => array( + 'path' => '{project}/regions/{region}/targetHttpsProxies/{targetHttpsProxy}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'region' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'targetHttpsProxy' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'insert' => array( + 'path' => '{project}/regions/{region}/targetHttpsProxies', + 'httpMethod' => 'POST', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'region' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'requestId' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'list' => array( + 'path' => '{project}/regions/{region}/targetHttpsProxies', + 'httpMethod' => 'GET', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'region' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'maxResults' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'orderBy' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'setSslCertificates' => array( + 'path' => '{project}/regions/{region}/targetHttpsProxies/{targetHttpsProxy}/setSslCertificates', + 'httpMethod' => 'POST', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'region' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'targetHttpsProxy' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'requestId' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'setUrlMap' => array( + 'path' => '{project}/regions/{region}/targetHttpsProxies/{targetHttpsProxy}/setUrlMap', + 'httpMethod' => 'POST', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'region' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'targetHttpsProxy' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'requestId' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ), + ) + ) + ); + $this->regionUrlMaps = new Google_Service_Compute_Resource_RegionUrlMaps( + $this, + $this->serviceName, + 'regionUrlMaps', + array( + 'methods' => array( + 'delete' => array( + 'path' => '{project}/regions/{region}/urlMaps/{urlMap}', + 'httpMethod' => 'DELETE', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'region' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'urlMap' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'requestId' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'get' => array( + 'path' => '{project}/regions/{region}/urlMaps/{urlMap}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'region' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'urlMap' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'insert' => array( + 'path' => '{project}/regions/{region}/urlMaps', + 'httpMethod' => 'POST', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'region' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'requestId' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'list' => array( + 'path' => '{project}/regions/{region}/urlMaps', + 'httpMethod' => 'GET', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'region' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'maxResults' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'orderBy' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'patch' => array( + 'path' => '{project}/regions/{region}/urlMaps/{urlMap}', + 'httpMethod' => 'PATCH', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'region' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'urlMap' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'requestId' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'update' => array( + 'path' => '{project}/regions/{region}/urlMaps/{urlMap}', + 'httpMethod' => 'PUT', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'region' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'urlMap' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'requestId' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'validate' => array( + 'path' => '{project}/regions/{region}/urlMaps/{urlMap}/validate', + 'httpMethod' => 'POST', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'region' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'urlMap' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ), + ) + ) + ); $this->regions = new Google_Service_Compute_Resource_Regions( $this, $this->serviceName, @@ -8142,7 +9040,33 @@ class Google_Service_Compute extends Google_Service 'sslCertificates', array( 'methods' => array( - 'delete' => array( + 'aggregatedList' => array( + 'path' => '{project}/aggregated/sslCertificates', + 'httpMethod' => 'GET', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'maxResults' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'orderBy' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'delete' => array( 'path' => '{project}/global/sslCertificates/{sslCertificate}', 'httpMethod' => 'DELETE', 'parameters' => array( @@ -8643,7 +9567,33 @@ class Google_Service_Compute extends Google_Service 'targetHttpProxies', array( 'methods' => array( - 'delete' => array( + 'aggregatedList' => array( + 'path' => '{project}/aggregated/targetHttpProxies', + 'httpMethod' => 'GET', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'maxResults' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'orderBy' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'delete' => array( 'path' => '{project}/global/targetHttpProxies/{targetHttpProxy}', 'httpMethod' => 'DELETE', 'parameters' => array( @@ -8746,7 +9696,33 @@ class Google_Service_Compute extends Google_Service 'targetHttpsProxies', array( 'methods' => array( - 'delete' => array( + 'aggregatedList' => array( + 'path' => '{project}/aggregated/targetHttpsProxies', + 'httpMethod' => 'GET', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'maxResults' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'orderBy' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'delete' => array( 'path' => '{project}/global/targetHttpsProxies/{targetHttpsProxy}', 'httpMethod' => 'DELETE', 'parameters' => array( @@ -9722,7 +10698,33 @@ class Google_Service_Compute extends Google_Service 'urlMaps', array( 'methods' => array( - 'delete' => array( + 'aggregatedList' => array( + 'path' => '{project}/aggregated/urlMaps', + 'httpMethod' => 'GET', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'maxResults' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'orderBy' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'delete' => array( 'path' => '{project}/global/urlMaps/{urlMap}', 'httpMethod' => 'DELETE', 'parameters' => array( @@ -9872,6 +10874,200 @@ class Google_Service_Compute extends Google_Service ) ) ); + $this->vpnGateways = new Google_Service_Compute_Resource_VpnGateways( + $this, + $this->serviceName, + 'vpnGateways', + array( + 'methods' => array( + 'aggregatedList' => array( + 'path' => '{project}/aggregated/vpnGateways', + 'httpMethod' => 'GET', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'maxResults' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'orderBy' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'delete' => array( + 'path' => '{project}/regions/{region}/vpnGateways/{vpnGateway}', + 'httpMethod' => 'DELETE', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'region' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'vpnGateway' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'requestId' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'get' => array( + 'path' => '{project}/regions/{region}/vpnGateways/{vpnGateway}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'region' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'vpnGateway' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'getStatus' => array( + 'path' => '{project}/regions/{region}/vpnGateways/{vpnGateway}/getStatus', + 'httpMethod' => 'GET', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'region' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'vpnGateway' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'insert' => array( + 'path' => '{project}/regions/{region}/vpnGateways', + 'httpMethod' => 'POST', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'region' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'requestId' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'list' => array( + 'path' => '{project}/regions/{region}/vpnGateways', + 'httpMethod' => 'GET', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'region' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'maxResults' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'orderBy' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'setLabels' => array( + 'path' => '{project}/regions/{region}/vpnGateways/{resource}/setLabels', + 'httpMethod' => 'POST', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'region' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'resource' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'requestId' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'testIamPermissions' => array( + 'path' => '{project}/regions/{region}/vpnGateways/{resource}/testIamPermissions', + 'httpMethod' => 'POST', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'region' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'resource' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ), + ) + ) + ); $this->vpnTunnels = new Google_Service_Compute_Resource_VpnTunnels( $this, $this->serviceName, diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/AuditLogConfig.php b/vendor/google/apiclient-services/src/Google/Service/Compute/AuditLogConfig.php index 5e4a65b..008caba 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Compute/AuditLogConfig.php +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/AuditLogConfig.php @@ -19,6 +19,7 @@ class Google_Service_Compute_AuditLogConfig extends Google_Collection { protected $collection_key = 'exemptedMembers'; public $exemptedMembers; + public $ignoreChildExemptions; public $logType; public function setExemptedMembers($exemptedMembers) @@ -29,6 +30,14 @@ class Google_Service_Compute_AuditLogConfig extends Google_Collection { return $this->exemptedMembers; } + public function setIgnoreChildExemptions($ignoreChildExemptions) + { + $this->ignoreChildExemptions = $ignoreChildExemptions; + } + public function getIgnoreChildExemptions() + { + return $this->ignoreChildExemptions; + } public function setLogType($logType) { $this->logType = $logType; diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/BackendService.php b/vendor/google/apiclient-services/src/Google/Service/Compute/BackendService.php index 038e004..6b48bd6 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Compute/BackendService.php +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/BackendService.php @@ -23,8 +23,12 @@ class Google_Service_Compute_BackendService extends Google_Collection protected $backendsDataType = 'array'; protected $cdnPolicyType = 'Google_Service_Compute_BackendServiceCdnPolicy'; protected $cdnPolicyDataType = ''; + protected $circuitBreakersType = 'Google_Service_Compute_CircuitBreakers'; + protected $circuitBreakersDataType = ''; protected $connectionDrainingType = 'Google_Service_Compute_ConnectionDraining'; protected $connectionDrainingDataType = ''; + protected $consistentHashType = 'Google_Service_Compute_ConsistentHashLoadBalancerSettings'; + protected $consistentHashDataType = ''; public $creationTimestamp; public $customRequestHeaders; public $description; @@ -36,7 +40,10 @@ class Google_Service_Compute_BackendService extends Google_Collection public $id; public $kind; public $loadBalancingScheme; + public $localityLbPolicy; public $name; + protected $outlierDetectionType = 'Google_Service_Compute_OutlierDetection'; + protected $outlierDetectionDataType = ''; public $port; public $portName; public $protocol; @@ -82,6 +89,20 @@ class Google_Service_Compute_BackendService extends Google_Collection { return $this->cdnPolicy; } + /** + * @param Google_Service_Compute_CircuitBreakers + */ + public function setCircuitBreakers(Google_Service_Compute_CircuitBreakers $circuitBreakers) + { + $this->circuitBreakers = $circuitBreakers; + } + /** + * @return Google_Service_Compute_CircuitBreakers + */ + public function getCircuitBreakers() + { + return $this->circuitBreakers; + } /** * @param Google_Service_Compute_ConnectionDraining */ @@ -96,6 +117,20 @@ class Google_Service_Compute_BackendService extends Google_Collection { return $this->connectionDraining; } + /** + * @param Google_Service_Compute_ConsistentHashLoadBalancerSettings + */ + public function setConsistentHash(Google_Service_Compute_ConsistentHashLoadBalancerSettings $consistentHash) + { + $this->consistentHash = $consistentHash; + } + /** + * @return Google_Service_Compute_ConsistentHashLoadBalancerSettings + */ + public function getConsistentHash() + { + return $this->consistentHash; + } public function setCreationTimestamp($creationTimestamp) { $this->creationTimestamp = $creationTimestamp; @@ -182,6 +217,14 @@ class Google_Service_Compute_BackendService extends Google_Collection { return $this->loadBalancingScheme; } + public function setLocalityLbPolicy($localityLbPolicy) + { + $this->localityLbPolicy = $localityLbPolicy; + } + public function getLocalityLbPolicy() + { + return $this->localityLbPolicy; + } public function setName($name) { $this->name = $name; @@ -190,6 +233,20 @@ class Google_Service_Compute_BackendService extends Google_Collection { return $this->name; } + /** + * @param Google_Service_Compute_OutlierDetection + */ + public function setOutlierDetection(Google_Service_Compute_OutlierDetection $outlierDetection) + { + $this->outlierDetection = $outlierDetection; + } + /** + * @return Google_Service_Compute_OutlierDetection + */ + public function getOutlierDetection() + { + return $this->outlierDetection; + } public function setPort($port) { $this->port = $port; diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/CircuitBreakers.php b/vendor/google/apiclient-services/src/Google/Service/Compute/CircuitBreakers.php new file mode 100644 index 0000000..5b587ec --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/CircuitBreakers.php @@ -0,0 +1,66 @@ +maxConnections = $maxConnections; + } + public function getMaxConnections() + { + return $this->maxConnections; + } + public function setMaxPendingRequests($maxPendingRequests) + { + $this->maxPendingRequests = $maxPendingRequests; + } + public function getMaxPendingRequests() + { + return $this->maxPendingRequests; + } + public function setMaxRequests($maxRequests) + { + $this->maxRequests = $maxRequests; + } + public function getMaxRequests() + { + return $this->maxRequests; + } + public function setMaxRequestsPerConnection($maxRequestsPerConnection) + { + $this->maxRequestsPerConnection = $maxRequestsPerConnection; + } + public function getMaxRequestsPerConnection() + { + return $this->maxRequestsPerConnection; + } + public function setMaxRetries($maxRetries) + { + $this->maxRetries = $maxRetries; + } + public function getMaxRetries() + { + return $this->maxRetries; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/ConsistentHashLoadBalancerSettings.php b/vendor/google/apiclient-services/src/Google/Service/Compute/ConsistentHashLoadBalancerSettings.php new file mode 100644 index 0000000..11b2114 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/ConsistentHashLoadBalancerSettings.php @@ -0,0 +1,55 @@ +httpCookie = $httpCookie; + } + /** + * @return Google_Service_Compute_ConsistentHashLoadBalancerSettingsHttpCookie + */ + public function getHttpCookie() + { + return $this->httpCookie; + } + public function setHttpHeaderName($httpHeaderName) + { + $this->httpHeaderName = $httpHeaderName; + } + public function getHttpHeaderName() + { + return $this->httpHeaderName; + } + public function setMinimumRingSize($minimumRingSize) + { + $this->minimumRingSize = $minimumRingSize; + } + public function getMinimumRingSize() + { + return $this->minimumRingSize; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/ConsistentHashLoadBalancerSettingsHttpCookie.php b/vendor/google/apiclient-services/src/Google/Service/Compute/ConsistentHashLoadBalancerSettingsHttpCookie.php new file mode 100644 index 0000000..b1d49f7 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/ConsistentHashLoadBalancerSettingsHttpCookie.php @@ -0,0 +1,55 @@ +name = $name; + } + public function getName() + { + return $this->name; + } + public function setPath($path) + { + $this->path = $path; + } + public function getPath() + { + return $this->path; + } + /** + * @param Google_Service_Compute_Duration + */ + public function setTtl(Google_Service_Compute_Duration $ttl) + { + $this->ttl = $ttl; + } + /** + * @return Google_Service_Compute_Duration + */ + public function getTtl() + { + return $this->ttl; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/CorsPolicy.php b/vendor/google/apiclient-services/src/Google/Service/Compute/CorsPolicy.php new file mode 100644 index 0000000..b68ed1c --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/CorsPolicy.php @@ -0,0 +1,94 @@ +allowCredentials = $allowCredentials; + } + public function getAllowCredentials() + { + return $this->allowCredentials; + } + public function setAllowHeaders($allowHeaders) + { + $this->allowHeaders = $allowHeaders; + } + public function getAllowHeaders() + { + return $this->allowHeaders; + } + public function setAllowMethods($allowMethods) + { + $this->allowMethods = $allowMethods; + } + public function getAllowMethods() + { + return $this->allowMethods; + } + public function setAllowOriginRegexes($allowOriginRegexes) + { + $this->allowOriginRegexes = $allowOriginRegexes; + } + public function getAllowOriginRegexes() + { + return $this->allowOriginRegexes; + } + public function setAllowOrigins($allowOrigins) + { + $this->allowOrigins = $allowOrigins; + } + public function getAllowOrigins() + { + return $this->allowOrigins; + } + public function setDisabled($disabled) + { + $this->disabled = $disabled; + } + public function getDisabled() + { + return $this->disabled; + } + public function setExposeHeaders($exposeHeaders) + { + $this->exposeHeaders = $exposeHeaders; + } + public function getExposeHeaders() + { + return $this->exposeHeaders; + } + public function setMaxAge($maxAge) + { + $this->maxAge = $maxAge; + } + public function getMaxAge() + { + return $this->maxAge; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/DisplayDevice.php b/vendor/google/apiclient-services/src/Google/Service/Compute/DisplayDevice.php new file mode 100644 index 0000000..0b291b9 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/DisplayDevice.php @@ -0,0 +1,30 @@ +enableDisplay = $enableDisplay; + } + public function getEnableDisplay() + { + return $this->enableDisplay; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1Vertex.php b/vendor/google/apiclient-services/src/Google/Service/Compute/Duration.php similarity index 65% rename from vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1Vertex.php rename to vendor/google/apiclient-services/src/Google/Service/Compute/Duration.php index 24b4505..2d0c5dd 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1Vertex.php +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/Duration.php @@ -15,25 +15,25 @@ * the License. */ -class Google_Service_Vision_GoogleCloudVisionV1p5beta1Vertex extends Google_Model +class Google_Service_Compute_Duration extends Google_Model { - public $x; - public $y; + public $nanos; + public $seconds; - public function setX($x) + public function setNanos($nanos) { - $this->x = $x; + $this->nanos = $nanos; } - public function getX() + public function getNanos() { - return $this->x; + return $this->nanos; } - public function setY($y) + public function setSeconds($seconds) { - $this->y = $y; + $this->seconds = $seconds; } - public function getY() + public function getSeconds() { - return $this->y; + return $this->seconds; } } diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/ExternalVpnGateway.php b/vendor/google/apiclient-services/src/Google/Service/Compute/ExternalVpnGateway.php new file mode 100644 index 0000000..edd3e42 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/ExternalVpnGateway.php @@ -0,0 +1,119 @@ +creationTimestamp = $creationTimestamp; + } + public function getCreationTimestamp() + { + return $this->creationTimestamp; + } + public function setDescription($description) + { + $this->description = $description; + } + public function getDescription() + { + return $this->description; + } + public function setId($id) + { + $this->id = $id; + } + public function getId() + { + return $this->id; + } + /** + * @param Google_Service_Compute_ExternalVpnGatewayInterface + */ + public function setInterfaces($interfaces) + { + $this->interfaces = $interfaces; + } + /** + * @return Google_Service_Compute_ExternalVpnGatewayInterface + */ + public function getInterfaces() + { + return $this->interfaces; + } + public function setKind($kind) + { + $this->kind = $kind; + } + public function getKind() + { + return $this->kind; + } + public function setLabelFingerprint($labelFingerprint) + { + $this->labelFingerprint = $labelFingerprint; + } + public function getLabelFingerprint() + { + return $this->labelFingerprint; + } + 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 setRedundancyType($redundancyType) + { + $this->redundancyType = $redundancyType; + } + public function getRedundancyType() + { + return $this->redundancyType; + } + public function setSelfLink($selfLink) + { + $this->selfLink = $selfLink; + } + public function getSelfLink() + { + return $this->selfLink; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dataflow/SnapshotJobRequest.php b/vendor/google/apiclient-services/src/Google/Service/Compute/ExternalVpnGatewayInterface.php similarity index 64% rename from vendor/google/apiclient-services/src/Google/Service/Dataflow/SnapshotJobRequest.php rename to vendor/google/apiclient-services/src/Google/Service/Compute/ExternalVpnGatewayInterface.php index 08e0dc4..2a625c4 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dataflow/SnapshotJobRequest.php +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/ExternalVpnGatewayInterface.php @@ -15,25 +15,25 @@ * the License. */ -class Google_Service_Dataflow_SnapshotJobRequest extends Google_Model +class Google_Service_Compute_ExternalVpnGatewayInterface extends Google_Model { - public $location; - public $ttl; + public $id; + public $ipAddress; - public function setLocation($location) + public function setId($id) { - $this->location = $location; + $this->id = $id; } - public function getLocation() + public function getId() { - return $this->location; + return $this->id; } - public function setTtl($ttl) + public function setIpAddress($ipAddress) { - $this->ttl = $ttl; + $this->ipAddress = $ipAddress; } - public function getTtl() + public function getIpAddress() { - return $this->ttl; + return $this->ipAddress; } } diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/ExternalVpnGatewayList.php b/vendor/google/apiclient-services/src/Google/Service/Compute/ExternalVpnGatewayList.php new file mode 100644 index 0000000..e6d72cf --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/ExternalVpnGatewayList.php @@ -0,0 +1,99 @@ +etag = $etag; + } + public function getEtag() + { + return $this->etag; + } + public function setId($id) + { + $this->id = $id; + } + public function getId() + { + return $this->id; + } + /** + * @param Google_Service_Compute_ExternalVpnGateway + */ + public function setItems($items) + { + $this->items = $items; + } + /** + * @return Google_Service_Compute_ExternalVpnGateway + */ + 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; + } + public function setSelfLink($selfLink) + { + $this->selfLink = $selfLink; + } + public function getSelfLink() + { + return $this->selfLink; + } + /** + * @param Google_Service_Compute_ExternalVpnGatewayListWarning + */ + public function setWarning(Google_Service_Compute_ExternalVpnGatewayListWarning $warning) + { + $this->warning = $warning; + } + /** + * @return Google_Service_Compute_ExternalVpnGatewayListWarning + */ + public function getWarning() + { + return $this->warning; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/ExternalVpnGatewayListWarning.php b/vendor/google/apiclient-services/src/Google/Service/Compute/ExternalVpnGatewayListWarning.php new file mode 100644 index 0000000..4248f41 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/ExternalVpnGatewayListWarning.php @@ -0,0 +1,56 @@ +code = $code; + } + public function getCode() + { + return $this->code; + } + /** + * @param Google_Service_Compute_ExternalVpnGatewayListWarningData + */ + public function setData($data) + { + $this->data = $data; + } + /** + * @return Google_Service_Compute_ExternalVpnGatewayListWarningData + */ + public function getData() + { + return $this->data; + } + public function setMessage($message) + { + $this->message = $message; + } + public function getMessage() + { + return $this->message; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1ProductKeyValue.php b/vendor/google/apiclient-services/src/Google/Service/Compute/ExternalVpnGatewayListWarningData.php similarity index 90% rename from vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1ProductKeyValue.php rename to vendor/google/apiclient-services/src/Google/Service/Compute/ExternalVpnGatewayListWarningData.php index 8c8edda..bfdf1a1 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1ProductKeyValue.php +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/ExternalVpnGatewayListWarningData.php @@ -15,7 +15,7 @@ * the License. */ -class Google_Service_Vision_GoogleCloudVisionV1p5beta1ProductKeyValue extends Google_Model +class Google_Service_Compute_ExternalVpnGatewayListWarningData extends Google_Model { public $key; public $value; diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/ForwardingRule.php b/vendor/google/apiclient-services/src/Google/Service/Compute/ForwardingRule.php index 9c4514d..cca0641 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Compute/ForwardingRule.php +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/ForwardingRule.php @@ -32,6 +32,8 @@ class Google_Service_Compute_ForwardingRule extends Google_Collection public $ipVersion; public $kind; public $loadBalancingScheme; + protected $metadataFiltersType = 'Google_Service_Compute_MetadataFilter'; + protected $metadataFiltersDataType = 'array'; public $name; public $network; public $networkTier; @@ -124,6 +126,20 @@ class Google_Service_Compute_ForwardingRule extends Google_Collection { return $this->loadBalancingScheme; } + /** + * @param Google_Service_Compute_MetadataFilter + */ + public function setMetadataFilters($metadataFilters) + { + $this->metadataFilters = $metadataFilters; + } + /** + * @return Google_Service_Compute_MetadataFilter + */ + public function getMetadataFilters() + { + return $this->metadataFilters; + } public function setName($name) { $this->name = $name; diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/HealthCheck.php b/vendor/google/apiclient-services/src/Google/Service/Compute/HealthCheck.php index 3618f20..10c6891 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Compute/HealthCheck.php +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/HealthCheck.php @@ -30,6 +30,7 @@ class Google_Service_Compute_HealthCheck extends Google_Model public $id; public $kind; public $name; + public $region; public $selfLink; protected $sslHealthCheckType = 'Google_Service_Compute_SSLHealthCheck'; protected $sslHealthCheckDataType = ''; @@ -137,6 +138,14 @@ class Google_Service_Compute_HealthCheck extends Google_Model { return $this->name; } + public function setRegion($region) + { + $this->region = $region; + } + public function getRegion() + { + return $this->region; + } public function setSelfLink($selfLink) { $this->selfLink = $selfLink; diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/HealthChecksAggregatedList.php b/vendor/google/apiclient-services/src/Google/Service/Compute/HealthChecksAggregatedList.php new file mode 100644 index 0000000..0e12d58 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/HealthChecksAggregatedList.php @@ -0,0 +1,89 @@ +id = $id; + } + public function getId() + { + return $this->id; + } + /** + * @param Google_Service_Compute_HealthChecksScopedList + */ + public function setItems($items) + { + $this->items = $items; + } + /** + * @return Google_Service_Compute_HealthChecksScopedList + */ + 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; + } + public function setSelfLink($selfLink) + { + $this->selfLink = $selfLink; + } + public function getSelfLink() + { + return $this->selfLink; + } + /** + * @param Google_Service_Compute_HealthChecksAggregatedListWarning + */ + public function setWarning(Google_Service_Compute_HealthChecksAggregatedListWarning $warning) + { + $this->warning = $warning; + } + /** + * @return Google_Service_Compute_HealthChecksAggregatedListWarning + */ + public function getWarning() + { + return $this->warning; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/HealthChecksAggregatedListWarning.php b/vendor/google/apiclient-services/src/Google/Service/Compute/HealthChecksAggregatedListWarning.php new file mode 100644 index 0000000..381b0f4 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/HealthChecksAggregatedListWarning.php @@ -0,0 +1,56 @@ +code = $code; + } + public function getCode() + { + return $this->code; + } + /** + * @param Google_Service_Compute_HealthChecksAggregatedListWarningData + */ + public function setData($data) + { + $this->data = $data; + } + /** + * @return Google_Service_Compute_HealthChecksAggregatedListWarningData + */ + public function getData() + { + return $this->data; + } + public function setMessage($message) + { + $this->message = $message; + } + public function getMessage() + { + return $this->message; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/HealthChecksAggregatedListWarningData.php b/vendor/google/apiclient-services/src/Google/Service/Compute/HealthChecksAggregatedListWarningData.php new file mode 100644 index 0000000..7f9952a --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/HealthChecksAggregatedListWarningData.php @@ -0,0 +1,39 @@ +key = $key; + } + public function getKey() + { + return $this->key; + } + public function setValue($value) + { + $this->value = $value; + } + public function getValue() + { + return $this->value; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/HealthChecksScopedList.php b/vendor/google/apiclient-services/src/Google/Service/Compute/HealthChecksScopedList.php new file mode 100644 index 0000000..9494fe7 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/HealthChecksScopedList.php @@ -0,0 +1,54 @@ +healthChecks = $healthChecks; + } + /** + * @return Google_Service_Compute_HealthCheck + */ + public function getHealthChecks() + { + return $this->healthChecks; + } + /** + * @param Google_Service_Compute_HealthChecksScopedListWarning + */ + public function setWarning(Google_Service_Compute_HealthChecksScopedListWarning $warning) + { + $this->warning = $warning; + } + /** + * @return Google_Service_Compute_HealthChecksScopedListWarning + */ + public function getWarning() + { + return $this->warning; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/HealthChecksScopedListWarning.php b/vendor/google/apiclient-services/src/Google/Service/Compute/HealthChecksScopedListWarning.php new file mode 100644 index 0000000..8877ceb --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/HealthChecksScopedListWarning.php @@ -0,0 +1,56 @@ +code = $code; + } + public function getCode() + { + return $this->code; + } + /** + * @param Google_Service_Compute_HealthChecksScopedListWarningData + */ + public function setData($data) + { + $this->data = $data; + } + /** + * @return Google_Service_Compute_HealthChecksScopedListWarningData + */ + public function getData() + { + return $this->data; + } + public function setMessage($message) + { + $this->message = $message; + } + public function getMessage() + { + return $this->message; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1Property.php b/vendor/google/apiclient-services/src/Google/Service/Compute/HealthChecksScopedListWarningData.php similarity index 67% rename from vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1Property.php rename to vendor/google/apiclient-services/src/Google/Service/Compute/HealthChecksScopedListWarningData.php index 8d19e13..4dbd947 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1Property.php +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/HealthChecksScopedListWarningData.php @@ -15,27 +15,18 @@ * the License. */ -class Google_Service_Vision_GoogleCloudVisionV1p5beta1Property extends Google_Model +class Google_Service_Compute_HealthChecksScopedListWarningData extends Google_Model { - public $name; - public $uint64Value; + public $key; public $value; - public function setName($name) + public function setKey($key) { - $this->name = $name; + $this->key = $key; } - public function getName() + public function getKey() { - return $this->name; - } - public function setUint64Value($uint64Value) - { - $this->uint64Value = $uint64Value; - } - public function getUint64Value() - { - return $this->uint64Value; + return $this->key; } public function setValue($value) { diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/HttpFaultAbort.php b/vendor/google/apiclient-services/src/Google/Service/Compute/HttpFaultAbort.php new file mode 100644 index 0000000..e6af2a3 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/HttpFaultAbort.php @@ -0,0 +1,39 @@ +httpStatus = $httpStatus; + } + public function getHttpStatus() + { + return $this->httpStatus; + } + public function setPercentage($percentage) + { + $this->percentage = $percentage; + } + public function getPercentage() + { + return $this->percentage; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1TextAnnotation.php b/vendor/google/apiclient-services/src/Google/Service/Compute/HttpFaultDelay.php similarity index 51% rename from vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1TextAnnotation.php rename to vendor/google/apiclient-services/src/Google/Service/Compute/HttpFaultDelay.php index e32be25..8859a30 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1TextAnnotation.php +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/HttpFaultDelay.php @@ -15,33 +15,32 @@ * the License. */ -class Google_Service_Vision_GoogleCloudVisionV1p5beta1TextAnnotation extends Google_Collection +class Google_Service_Compute_HttpFaultDelay extends Google_Model { - protected $collection_key = 'pages'; - protected $pagesType = 'Google_Service_Vision_GoogleCloudVisionV1p5beta1Page'; - protected $pagesDataType = 'array'; - public $text; + protected $fixedDelayType = 'Google_Service_Compute_Duration'; + protected $fixedDelayDataType = ''; + public $percentage; /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1Page + * @param Google_Service_Compute_Duration */ - public function setPages($pages) + public function setFixedDelay(Google_Service_Compute_Duration $fixedDelay) { - $this->pages = $pages; + $this->fixedDelay = $fixedDelay; } /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1Page + * @return Google_Service_Compute_Duration */ - public function getPages() + public function getFixedDelay() { - return $this->pages; + return $this->fixedDelay; } - public function setText($text) + public function setPercentage($percentage) { - $this->text = $text; + $this->percentage = $percentage; } - public function getText() + public function getPercentage() { - return $this->text; + return $this->percentage; } } diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/HttpFaultInjection.php b/vendor/google/apiclient-services/src/Google/Service/Compute/HttpFaultInjection.php new file mode 100644 index 0000000..3877497 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/HttpFaultInjection.php @@ -0,0 +1,53 @@ +abort = $abort; + } + /** + * @return Google_Service_Compute_HttpFaultAbort + */ + public function getAbort() + { + return $this->abort; + } + /** + * @param Google_Service_Compute_HttpFaultDelay + */ + public function setDelay(Google_Service_Compute_HttpFaultDelay $delay) + { + $this->delay = $delay; + } + /** + * @return Google_Service_Compute_HttpFaultDelay + */ + public function getDelay() + { + return $this->delay; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/HttpHeaderAction.php b/vendor/google/apiclient-services/src/Google/Service/Compute/HttpHeaderAction.php new file mode 100644 index 0000000..37f5d0d --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/HttpHeaderAction.php @@ -0,0 +1,72 @@ +requestHeadersToAdd = $requestHeadersToAdd; + } + /** + * @return Google_Service_Compute_HttpHeaderOption + */ + public function getRequestHeadersToAdd() + { + return $this->requestHeadersToAdd; + } + public function setRequestHeadersToRemove($requestHeadersToRemove) + { + $this->requestHeadersToRemove = $requestHeadersToRemove; + } + public function getRequestHeadersToRemove() + { + return $this->requestHeadersToRemove; + } + /** + * @param Google_Service_Compute_HttpHeaderOption + */ + public function setResponseHeadersToAdd($responseHeadersToAdd) + { + $this->responseHeadersToAdd = $responseHeadersToAdd; + } + /** + * @return Google_Service_Compute_HttpHeaderOption + */ + public function getResponseHeadersToAdd() + { + return $this->responseHeadersToAdd; + } + public function setResponseHeadersToRemove($responseHeadersToRemove) + { + $this->responseHeadersToRemove = $responseHeadersToRemove; + } + public function getResponseHeadersToRemove() + { + return $this->responseHeadersToRemove; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/HttpHeaderMatch.php b/vendor/google/apiclient-services/src/Google/Service/Compute/HttpHeaderMatch.php new file mode 100644 index 0000000..e038d3c --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/HttpHeaderMatch.php @@ -0,0 +1,100 @@ +exactMatch = $exactMatch; + } + public function getExactMatch() + { + return $this->exactMatch; + } + public function setHeaderName($headerName) + { + $this->headerName = $headerName; + } + public function getHeaderName() + { + return $this->headerName; + } + public function setInvertMatch($invertMatch) + { + $this->invertMatch = $invertMatch; + } + public function getInvertMatch() + { + return $this->invertMatch; + } + public function setPrefixMatch($prefixMatch) + { + $this->prefixMatch = $prefixMatch; + } + public function getPrefixMatch() + { + return $this->prefixMatch; + } + public function setPresentMatch($presentMatch) + { + $this->presentMatch = $presentMatch; + } + public function getPresentMatch() + { + return $this->presentMatch; + } + /** + * @param Google_Service_Compute_Int64RangeMatch + */ + public function setRangeMatch(Google_Service_Compute_Int64RangeMatch $rangeMatch) + { + $this->rangeMatch = $rangeMatch; + } + /** + * @return Google_Service_Compute_Int64RangeMatch + */ + public function getRangeMatch() + { + return $this->rangeMatch; + } + public function setRegexMatch($regexMatch) + { + $this->regexMatch = $regexMatch; + } + public function getRegexMatch() + { + return $this->regexMatch; + } + public function setSuffixMatch($suffixMatch) + { + $this->suffixMatch = $suffixMatch; + } + public function getSuffixMatch() + { + return $this->suffixMatch; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/HttpHeaderOption.php b/vendor/google/apiclient-services/src/Google/Service/Compute/HttpHeaderOption.php new file mode 100644 index 0000000..ee1432e --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/HttpHeaderOption.php @@ -0,0 +1,48 @@ +headerName = $headerName; + } + public function getHeaderName() + { + return $this->headerName; + } + public function setHeaderValue($headerValue) + { + $this->headerValue = $headerValue; + } + public function getHeaderValue() + { + return $this->headerValue; + } + public function setReplace($replace) + { + $this->replace = $replace; + } + public function getReplace() + { + return $this->replace; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/HttpQueryParameterMatch.php b/vendor/google/apiclient-services/src/Google/Service/Compute/HttpQueryParameterMatch.php new file mode 100644 index 0000000..47be76f --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/HttpQueryParameterMatch.php @@ -0,0 +1,57 @@ +exactMatch = $exactMatch; + } + public function getExactMatch() + { + return $this->exactMatch; + } + public function setName($name) + { + $this->name = $name; + } + public function getName() + { + return $this->name; + } + public function setPresentMatch($presentMatch) + { + $this->presentMatch = $presentMatch; + } + public function getPresentMatch() + { + return $this->presentMatch; + } + public function setRegexMatch($regexMatch) + { + $this->regexMatch = $regexMatch; + } + public function getRegexMatch() + { + return $this->regexMatch; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/HttpRedirectAction.php b/vendor/google/apiclient-services/src/Google/Service/Compute/HttpRedirectAction.php new file mode 100644 index 0000000..348031e --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/HttpRedirectAction.php @@ -0,0 +1,75 @@ +hostRedirect = $hostRedirect; + } + public function getHostRedirect() + { + return $this->hostRedirect; + } + public function setHttpsRedirect($httpsRedirect) + { + $this->httpsRedirect = $httpsRedirect; + } + public function getHttpsRedirect() + { + return $this->httpsRedirect; + } + public function setPathRedirect($pathRedirect) + { + $this->pathRedirect = $pathRedirect; + } + public function getPathRedirect() + { + return $this->pathRedirect; + } + public function setPrefixRedirect($prefixRedirect) + { + $this->prefixRedirect = $prefixRedirect; + } + public function getPrefixRedirect() + { + return $this->prefixRedirect; + } + public function setRedirectResponseCode($redirectResponseCode) + { + $this->redirectResponseCode = $redirectResponseCode; + } + public function getRedirectResponseCode() + { + return $this->redirectResponseCode; + } + public function setStripQuery($stripQuery) + { + $this->stripQuery = $stripQuery; + } + public function getStripQuery() + { + return $this->stripQuery; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/HttpRetryPolicy.php b/vendor/google/apiclient-services/src/Google/Service/Compute/HttpRetryPolicy.php new file mode 100644 index 0000000..659115e --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/HttpRetryPolicy.php @@ -0,0 +1,56 @@ +numRetries = $numRetries; + } + public function getNumRetries() + { + return $this->numRetries; + } + /** + * @param Google_Service_Compute_Duration + */ + public function setPerTryTimeout(Google_Service_Compute_Duration $perTryTimeout) + { + $this->perTryTimeout = $perTryTimeout; + } + /** + * @return Google_Service_Compute_Duration + */ + public function getPerTryTimeout() + { + return $this->perTryTimeout; + } + public function setRetryConditions($retryConditions) + { + $this->retryConditions = $retryConditions; + } + public function getRetryConditions() + { + return $this->retryConditions; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/HttpRouteAction.php b/vendor/google/apiclient-services/src/Google/Service/Compute/HttpRouteAction.php new file mode 100644 index 0000000..cfb7b76 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/HttpRouteAction.php @@ -0,0 +1,134 @@ +corsPolicy = $corsPolicy; + } + /** + * @return Google_Service_Compute_CorsPolicy + */ + public function getCorsPolicy() + { + return $this->corsPolicy; + } + /** + * @param Google_Service_Compute_HttpFaultInjection + */ + public function setFaultInjectionPolicy(Google_Service_Compute_HttpFaultInjection $faultInjectionPolicy) + { + $this->faultInjectionPolicy = $faultInjectionPolicy; + } + /** + * @return Google_Service_Compute_HttpFaultInjection + */ + public function getFaultInjectionPolicy() + { + return $this->faultInjectionPolicy; + } + /** + * @param Google_Service_Compute_RequestMirrorPolicy + */ + public function setRequestMirrorPolicy(Google_Service_Compute_RequestMirrorPolicy $requestMirrorPolicy) + { + $this->requestMirrorPolicy = $requestMirrorPolicy; + } + /** + * @return Google_Service_Compute_RequestMirrorPolicy + */ + public function getRequestMirrorPolicy() + { + return $this->requestMirrorPolicy; + } + /** + * @param Google_Service_Compute_HttpRetryPolicy + */ + public function setRetryPolicy(Google_Service_Compute_HttpRetryPolicy $retryPolicy) + { + $this->retryPolicy = $retryPolicy; + } + /** + * @return Google_Service_Compute_HttpRetryPolicy + */ + public function getRetryPolicy() + { + return $this->retryPolicy; + } + /** + * @param Google_Service_Compute_Duration + */ + public function setTimeout(Google_Service_Compute_Duration $timeout) + { + $this->timeout = $timeout; + } + /** + * @return Google_Service_Compute_Duration + */ + public function getTimeout() + { + return $this->timeout; + } + /** + * @param Google_Service_Compute_UrlRewrite + */ + public function setUrlRewrite(Google_Service_Compute_UrlRewrite $urlRewrite) + { + $this->urlRewrite = $urlRewrite; + } + /** + * @return Google_Service_Compute_UrlRewrite + */ + public function getUrlRewrite() + { + return $this->urlRewrite; + } + /** + * @param Google_Service_Compute_WeightedBackendService + */ + public function setWeightedBackendServices($weightedBackendServices) + { + $this->weightedBackendServices = $weightedBackendServices; + } + /** + * @return Google_Service_Compute_WeightedBackendService + */ + public function getWeightedBackendServices() + { + return $this->weightedBackendServices; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/HttpRouteRule.php b/vendor/google/apiclient-services/src/Google/Service/Compute/HttpRouteRule.php new file mode 100644 index 0000000..23c27d4 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/HttpRouteRule.php @@ -0,0 +1,95 @@ +headerAction = $headerAction; + } + /** + * @return Google_Service_Compute_HttpHeaderAction + */ + public function getHeaderAction() + { + return $this->headerAction; + } + /** + * @param Google_Service_Compute_HttpRouteRuleMatch + */ + public function setMatchRules($matchRules) + { + $this->matchRules = $matchRules; + } + /** + * @return Google_Service_Compute_HttpRouteRuleMatch + */ + public function getMatchRules() + { + return $this->matchRules; + } + /** + * @param Google_Service_Compute_HttpRouteAction + */ + public function setRouteAction(Google_Service_Compute_HttpRouteAction $routeAction) + { + $this->routeAction = $routeAction; + } + /** + * @return Google_Service_Compute_HttpRouteAction + */ + public function getRouteAction() + { + return $this->routeAction; + } + public function setService($service) + { + $this->service = $service; + } + public function getService() + { + return $this->service; + } + /** + * @param Google_Service_Compute_HttpRedirectAction + */ + public function setUrlRedirect(Google_Service_Compute_HttpRedirectAction $urlRedirect) + { + $this->urlRedirect = $urlRedirect; + } + /** + * @return Google_Service_Compute_HttpRedirectAction + */ + public function getUrlRedirect() + { + return $this->urlRedirect; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/HttpRouteRuleMatch.php b/vendor/google/apiclient-services/src/Google/Service/Compute/HttpRouteRuleMatch.php new file mode 100644 index 0000000..2d9986e --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/HttpRouteRuleMatch.php @@ -0,0 +1,106 @@ +fullPathMatch = $fullPathMatch; + } + public function getFullPathMatch() + { + return $this->fullPathMatch; + } + /** + * @param Google_Service_Compute_HttpHeaderMatch + */ + public function setHeaderMatches($headerMatches) + { + $this->headerMatches = $headerMatches; + } + /** + * @return Google_Service_Compute_HttpHeaderMatch + */ + public function getHeaderMatches() + { + return $this->headerMatches; + } + public function setIgnoreCase($ignoreCase) + { + $this->ignoreCase = $ignoreCase; + } + public function getIgnoreCase() + { + return $this->ignoreCase; + } + /** + * @param Google_Service_Compute_MetadataFilter + */ + public function setMetadataFilters($metadataFilters) + { + $this->metadataFilters = $metadataFilters; + } + /** + * @return Google_Service_Compute_MetadataFilter + */ + public function getMetadataFilters() + { + return $this->metadataFilters; + } + public function setPrefixMatch($prefixMatch) + { + $this->prefixMatch = $prefixMatch; + } + public function getPrefixMatch() + { + return $this->prefixMatch; + } + /** + * @param Google_Service_Compute_HttpQueryParameterMatch + */ + public function setQueryParameterMatches($queryParameterMatches) + { + $this->queryParameterMatches = $queryParameterMatches; + } + /** + * @return Google_Service_Compute_HttpQueryParameterMatch + */ + public function getQueryParameterMatches() + { + return $this->queryParameterMatches; + } + public function setRegexMatch($regexMatch) + { + $this->regexMatch = $regexMatch; + } + public function getRegexMatch() + { + return $this->regexMatch; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/Instance.php b/vendor/google/apiclient-services/src/Google/Service/Compute/Instance.php index 8252d4f..cf48439 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Compute/Instance.php +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/Instance.php @@ -25,6 +25,8 @@ class Google_Service_Compute_Instance extends Google_Collection public $description; protected $disksType = 'Google_Service_Compute_AttachedDisk'; protected $disksDataType = 'array'; + protected $displayDeviceType = 'Google_Service_Compute_DisplayDevice'; + protected $displayDeviceDataType = ''; protected $guestAcceleratorsType = 'Google_Service_Compute_AcceleratorConfig'; protected $guestAcceleratorsDataType = 'array'; public $hostname; @@ -111,6 +113,20 @@ class Google_Service_Compute_Instance extends Google_Collection { return $this->disks; } + /** + * @param Google_Service_Compute_DisplayDevice + */ + public function setDisplayDevice(Google_Service_Compute_DisplayDevice $displayDevice) + { + $this->displayDevice = $displayDevice; + } + /** + * @return Google_Service_Compute_DisplayDevice + */ + public function getDisplayDevice() + { + return $this->displayDevice; + } /** * @param Google_Service_Compute_AcceleratorConfig */ diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/Int64RangeMatch.php b/vendor/google/apiclient-services/src/Google/Service/Compute/Int64RangeMatch.php new file mode 100644 index 0000000..213e578 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/Int64RangeMatch.php @@ -0,0 +1,39 @@ +rangeEnd = $rangeEnd; + } + public function getRangeEnd() + { + return $this->rangeEnd; + } + public function setRangeStart($rangeStart) + { + $this->rangeStart = $rangeStart; + } + public function getRangeStart() + { + return $this->rangeStart; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/MetadataFilter.php b/vendor/google/apiclient-services/src/Google/Service/Compute/MetadataFilter.php new file mode 100644 index 0000000..377a0b9 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/MetadataFilter.php @@ -0,0 +1,47 @@ +filterLabels = $filterLabels; + } + /** + * @return Google_Service_Compute_MetadataFilterLabelMatch + */ + public function getFilterLabels() + { + return $this->filterLabels; + } + public function setFilterMatchCriteria($filterMatchCriteria) + { + $this->filterMatchCriteria = $filterMatchCriteria; + } + public function getFilterMatchCriteria() + { + return $this->filterMatchCriteria; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/MetadataFilterLabelMatch.php b/vendor/google/apiclient-services/src/Google/Service/Compute/MetadataFilterLabelMatch.php new file mode 100644 index 0000000..71540a2 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/MetadataFilterLabelMatch.php @@ -0,0 +1,39 @@ +name = $name; + } + public function getName() + { + return $this->name; + } + public function setValue($value) + { + $this->value = $value; + } + public function getValue() + { + return $this->value; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/NetworkPeering.php b/vendor/google/apiclient-services/src/Google/Service/Compute/NetworkPeering.php index 3317ecc..3119c2d 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Compute/NetworkPeering.php +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/NetworkPeering.php @@ -19,6 +19,8 @@ class Google_Service_Compute_NetworkPeering extends Google_Model { public $autoCreateRoutes; public $exchangeSubnetRoutes; + public $exportCustomRoutes; + public $importCustomRoutes; public $name; public $network; public $state; @@ -40,6 +42,22 @@ class Google_Service_Compute_NetworkPeering extends Google_Model { return $this->exchangeSubnetRoutes; } + public function setExportCustomRoutes($exportCustomRoutes) + { + $this->exportCustomRoutes = $exportCustomRoutes; + } + public function getExportCustomRoutes() + { + return $this->exportCustomRoutes; + } + public function setImportCustomRoutes($importCustomRoutes) + { + $this->importCustomRoutes = $importCustomRoutes; + } + public function getImportCustomRoutes() + { + return $this->importCustomRoutes; + } public function setName($name) { $this->name = $name; diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/NetworksUpdatePeeringRequest.php b/vendor/google/apiclient-services/src/Google/Service/Compute/NetworksUpdatePeeringRequest.php new file mode 100644 index 0000000..2426b50 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/NetworksUpdatePeeringRequest.php @@ -0,0 +1,37 @@ +networkPeering = $networkPeering; + } + /** + * @return Google_Service_Compute_NetworkPeering + */ + public function getNetworkPeering() + { + return $this->networkPeering; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/OutlierDetection.php b/vendor/google/apiclient-services/src/Google/Service/Compute/OutlierDetection.php new file mode 100644 index 0000000..de05f3b --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/OutlierDetection.php @@ -0,0 +1,134 @@ +baseEjectionTime = $baseEjectionTime; + } + /** + * @return Google_Service_Compute_Duration + */ + public function getBaseEjectionTime() + { + return $this->baseEjectionTime; + } + public function setConsecutiveErrors($consecutiveErrors) + { + $this->consecutiveErrors = $consecutiveErrors; + } + public function getConsecutiveErrors() + { + return $this->consecutiveErrors; + } + public function setConsecutiveGatewayFailure($consecutiveGatewayFailure) + { + $this->consecutiveGatewayFailure = $consecutiveGatewayFailure; + } + public function getConsecutiveGatewayFailure() + { + return $this->consecutiveGatewayFailure; + } + public function setEnforcingConsecutiveErrors($enforcingConsecutiveErrors) + { + $this->enforcingConsecutiveErrors = $enforcingConsecutiveErrors; + } + public function getEnforcingConsecutiveErrors() + { + return $this->enforcingConsecutiveErrors; + } + public function setEnforcingConsecutiveGatewayFailure($enforcingConsecutiveGatewayFailure) + { + $this->enforcingConsecutiveGatewayFailure = $enforcingConsecutiveGatewayFailure; + } + public function getEnforcingConsecutiveGatewayFailure() + { + return $this->enforcingConsecutiveGatewayFailure; + } + public function setEnforcingSuccessRate($enforcingSuccessRate) + { + $this->enforcingSuccessRate = $enforcingSuccessRate; + } + public function getEnforcingSuccessRate() + { + return $this->enforcingSuccessRate; + } + /** + * @param Google_Service_Compute_Duration + */ + public function setInterval(Google_Service_Compute_Duration $interval) + { + $this->interval = $interval; + } + /** + * @return Google_Service_Compute_Duration + */ + public function getInterval() + { + return $this->interval; + } + public function setMaxEjectionPercent($maxEjectionPercent) + { + $this->maxEjectionPercent = $maxEjectionPercent; + } + public function getMaxEjectionPercent() + { + return $this->maxEjectionPercent; + } + public function setSuccessRateMinimumHosts($successRateMinimumHosts) + { + $this->successRateMinimumHosts = $successRateMinimumHosts; + } + public function getSuccessRateMinimumHosts() + { + return $this->successRateMinimumHosts; + } + public function setSuccessRateRequestVolume($successRateRequestVolume) + { + $this->successRateRequestVolume = $successRateRequestVolume; + } + public function getSuccessRateRequestVolume() + { + return $this->successRateRequestVolume; + } + public function setSuccessRateStdevFactor($successRateStdevFactor) + { + $this->successRateStdevFactor = $successRateStdevFactor; + } + public function getSuccessRateStdevFactor() + { + return $this->successRateStdevFactor; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/PathMatcher.php b/vendor/google/apiclient-services/src/Google/Service/Compute/PathMatcher.php index f8e583c..fefdc3d 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Compute/PathMatcher.php +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/PathMatcher.php @@ -17,13 +17,35 @@ class Google_Service_Compute_PathMatcher extends Google_Collection { - protected $collection_key = 'pathRules'; + protected $collection_key = 'routeRules'; + protected $defaultRouteActionType = 'Google_Service_Compute_HttpRouteAction'; + protected $defaultRouteActionDataType = ''; public $defaultService; + protected $defaultUrlRedirectType = 'Google_Service_Compute_HttpRedirectAction'; + protected $defaultUrlRedirectDataType = ''; public $description; + protected $headerActionType = 'Google_Service_Compute_HttpHeaderAction'; + protected $headerActionDataType = ''; public $name; protected $pathRulesType = 'Google_Service_Compute_PathRule'; protected $pathRulesDataType = 'array'; + protected $routeRulesType = 'Google_Service_Compute_HttpRouteRule'; + protected $routeRulesDataType = 'array'; + /** + * @param Google_Service_Compute_HttpRouteAction + */ + public function setDefaultRouteAction(Google_Service_Compute_HttpRouteAction $defaultRouteAction) + { + $this->defaultRouteAction = $defaultRouteAction; + } + /** + * @return Google_Service_Compute_HttpRouteAction + */ + public function getDefaultRouteAction() + { + return $this->defaultRouteAction; + } public function setDefaultService($defaultService) { $this->defaultService = $defaultService; @@ -32,6 +54,20 @@ class Google_Service_Compute_PathMatcher extends Google_Collection { return $this->defaultService; } + /** + * @param Google_Service_Compute_HttpRedirectAction + */ + public function setDefaultUrlRedirect(Google_Service_Compute_HttpRedirectAction $defaultUrlRedirect) + { + $this->defaultUrlRedirect = $defaultUrlRedirect; + } + /** + * @return Google_Service_Compute_HttpRedirectAction + */ + public function getDefaultUrlRedirect() + { + return $this->defaultUrlRedirect; + } public function setDescription($description) { $this->description = $description; @@ -40,6 +76,20 @@ class Google_Service_Compute_PathMatcher extends Google_Collection { return $this->description; } + /** + * @param Google_Service_Compute_HttpHeaderAction + */ + public function setHeaderAction(Google_Service_Compute_HttpHeaderAction $headerAction) + { + $this->headerAction = $headerAction; + } + /** + * @return Google_Service_Compute_HttpHeaderAction + */ + public function getHeaderAction() + { + return $this->headerAction; + } public function setName($name) { $this->name = $name; @@ -62,4 +112,18 @@ class Google_Service_Compute_PathMatcher extends Google_Collection { return $this->pathRules; } + /** + * @param Google_Service_Compute_HttpRouteRule + */ + public function setRouteRules($routeRules) + { + $this->routeRules = $routeRules; + } + /** + * @return Google_Service_Compute_HttpRouteRule + */ + public function getRouteRules() + { + return $this->routeRules; + } } diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/PathRule.php b/vendor/google/apiclient-services/src/Google/Service/Compute/PathRule.php index 5016141..227f29b 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Compute/PathRule.php +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/PathRule.php @@ -19,7 +19,11 @@ class Google_Service_Compute_PathRule extends Google_Collection { protected $collection_key = 'paths'; public $paths; + protected $routeActionType = 'Google_Service_Compute_HttpRouteAction'; + protected $routeActionDataType = ''; public $service; + protected $urlRedirectType = 'Google_Service_Compute_HttpRedirectAction'; + protected $urlRedirectDataType = ''; public function setPaths($paths) { @@ -29,6 +33,20 @@ class Google_Service_Compute_PathRule extends Google_Collection { return $this->paths; } + /** + * @param Google_Service_Compute_HttpRouteAction + */ + public function setRouteAction(Google_Service_Compute_HttpRouteAction $routeAction) + { + $this->routeAction = $routeAction; + } + /** + * @return Google_Service_Compute_HttpRouteAction + */ + public function getRouteAction() + { + return $this->routeAction; + } public function setService($service) { $this->service = $service; @@ -37,4 +55,18 @@ class Google_Service_Compute_PathRule extends Google_Collection { return $this->service; } + /** + * @param Google_Service_Compute_HttpRedirectAction + */ + public function setUrlRedirect(Google_Service_Compute_HttpRedirectAction $urlRedirect) + { + $this->urlRedirect = $urlRedirect; + } + /** + * @return Google_Service_Compute_HttpRedirectAction + */ + public function getUrlRedirect() + { + return $this->urlRedirect; + } } diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/RegionTargetHttpsProxiesSetSslCertificatesRequest.php b/vendor/google/apiclient-services/src/Google/Service/Compute/RegionTargetHttpsProxiesSetSslCertificatesRequest.php new file mode 100644 index 0000000..215fc40 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/RegionTargetHttpsProxiesSetSslCertificatesRequest.php @@ -0,0 +1,31 @@ +sslCertificates = $sslCertificates; + } + public function getSslCertificates() + { + return $this->sslCertificates; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1LocationInfo.php b/vendor/google/apiclient-services/src/Google/Service/Compute/RegionUrlMapsValidateRequest.php similarity index 60% rename from vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1LocationInfo.php rename to vendor/google/apiclient-services/src/Google/Service/Compute/RegionUrlMapsValidateRequest.php index c8bafaf..425d149 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1LocationInfo.php +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/RegionUrlMapsValidateRequest.php @@ -15,23 +15,23 @@ * the License. */ -class Google_Service_Vision_GoogleCloudVisionV1p5beta1LocationInfo extends Google_Model +class Google_Service_Compute_RegionUrlMapsValidateRequest extends Google_Model { - protected $latLngType = 'Google_Service_Vision_LatLng'; - protected $latLngDataType = ''; + protected $resourceType = 'Google_Service_Compute_UrlMap'; + protected $resourceDataType = ''; /** - * @param Google_Service_Vision_LatLng + * @param Google_Service_Compute_UrlMap */ - public function setLatLng(Google_Service_Vision_LatLng $latLng) + public function setResource(Google_Service_Compute_UrlMap $resource) { - $this->latLng = $latLng; + $this->resource = $resource; } /** - * @return Google_Service_Vision_LatLng + * @return Google_Service_Compute_UrlMap */ - public function getLatLng() + public function getResource() { - return $this->latLng; + return $this->resource; } } diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/RequestMirrorPolicy.php b/vendor/google/apiclient-services/src/Google/Service/Compute/RequestMirrorPolicy.php new file mode 100644 index 0000000..17f568b --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/RequestMirrorPolicy.php @@ -0,0 +1,30 @@ +backendService = $backendService; + } + public function getBackendService() + { + return $this->backendService; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/ExternalVpnGateways.php b/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/ExternalVpnGateways.php new file mode 100644 index 0000000..b0de49d --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/ExternalVpnGateways.php @@ -0,0 +1,183 @@ + + * $computeService = new Google_Service_Compute(...); + * $externalVpnGateways = $computeService->externalVpnGateways; + * + */ +class Google_Service_Compute_Resource_ExternalVpnGateways extends Google_Service_Resource +{ + /** + * Deletes the specified externalVpnGateway. (externalVpnGateways.delete) + * + * @param string $project Project ID for this request. + * @param string $externalVpnGateway Name of the externalVpnGateways to delete. + * @param array $optParams Optional parameters. + * + * @opt_param string requestId An optional request ID to identify requests. + * Specify a unique request ID so that if you must retry your request, the + * server will know to ignore the request if it has already been completed. + * + * For example, consider a situation where you make an initial request and the + * request times out. If you make the request again with the same request ID, + * the server can check if original operation with the same request ID was + * received, and if so, will ignore the second request. This prevents clients + * from accidentally creating duplicate commitments. + * + * The request ID must be a valid UUID with the exception that zero UUID is not + * supported (00000000-0000-0000-0000-000000000000). + * @return Google_Service_Compute_Operation + */ + public function delete($project, $externalVpnGateway, $optParams = array()) + { + $params = array('project' => $project, 'externalVpnGateway' => $externalVpnGateway); + $params = array_merge($params, $optParams); + return $this->call('delete', array($params), "Google_Service_Compute_Operation"); + } + /** + * Returns the specified externalVpnGateway. Get a list of available + * externalVpnGateways by making a list() request. (externalVpnGateways.get) + * + * @param string $project Project ID for this request. + * @param string $externalVpnGateway Name of the externalVpnGateway to return. + * @param array $optParams Optional parameters. + * @return Google_Service_Compute_ExternalVpnGateway + */ + public function get($project, $externalVpnGateway, $optParams = array()) + { + $params = array('project' => $project, 'externalVpnGateway' => $externalVpnGateway); + $params = array_merge($params, $optParams); + return $this->call('get', array($params), "Google_Service_Compute_ExternalVpnGateway"); + } + /** + * Creates a ExternalVpnGateway in the specified project using the data included + * in the request. (externalVpnGateways.insert) + * + * @param string $project Project ID for this request. + * @param Google_Service_Compute_ExternalVpnGateway $postBody + * @param array $optParams Optional parameters. + * + * @opt_param string requestId An optional request ID to identify requests. + * Specify a unique request ID so that if you must retry your request, the + * server will know to ignore the request if it has already been completed. + * + * For example, consider a situation where you make an initial request and the + * request times out. If you make the request again with the same request ID, + * the server can check if original operation with the same request ID was + * received, and if so, will ignore the second request. This prevents clients + * from accidentally creating duplicate commitments. + * + * The request ID must be a valid UUID with the exception that zero UUID is not + * supported (00000000-0000-0000-0000-000000000000). + * @return Google_Service_Compute_Operation + */ + public function insert($project, Google_Service_Compute_ExternalVpnGateway $postBody, $optParams = array()) + { + $params = array('project' => $project, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('insert', array($params), "Google_Service_Compute_Operation"); + } + /** + * Retrieves the list of ExternalVpnGateway available to the specified project. + * (externalVpnGateways.listExternalVpnGateways) + * + * @param string $project Project ID for this request. + * @param array $optParams Optional parameters. + * + * @opt_param string filter A filter expression that filters resources listed in + * the response. The expression must specify the field name, a comparison + * operator, and the value that you want to use for filtering. The value must be + * a string, a number, or a boolean. The comparison operator must be either =, + * !=, >, or <. + * + * For example, if you are filtering Compute Engine instances, you can exclude + * instances named example-instance by specifying name != example-instance. + * + * You can also filter nested fields. For example, you could specify + * scheduling.automaticRestart = false to include instances only if they are not + * scheduled for automatic restarts. You can use filtering on nested fields to + * filter based on resource labels. + * + * To filter on multiple expressions, provide each separate expression within + * parentheses. For example, (scheduling.automaticRestart = true) (cpuPlatform = + * "Intel Skylake"). By default, each expression is an AND expression. However, + * you can include AND and OR expressions explicitly. For example, (cpuPlatform + * = "Intel Skylake") OR (cpuPlatform = "Intel Broadwell") AND + * (scheduling.automaticRestart = true). + * @opt_param string maxResults The maximum number of results per page that + * should be returned. If the number of available results is larger than + * maxResults, Compute Engine returns a nextPageToken that can be used to get + * the next page of results in subsequent list requests. Acceptable values are 0 + * to 500, inclusive. (Default: 500) + * @opt_param string orderBy Sorts list results by a certain order. By default, + * results are returned in alphanumerical order based on the resource name. + * + * You can also sort results in descending order based on the creation timestamp + * using orderBy="creationTimestamp desc". This sorts results based on the + * creationTimestamp field in reverse chronological order (newest result first). + * Use this to sort resources like operations so that the newest operation is + * returned first. + * + * Currently, only sorting by name or creationTimestamp desc is supported. + * @opt_param string pageToken Specifies a page token to use. Set pageToken to + * the nextPageToken returned by a previous list request to get the next page of + * results. + * @return Google_Service_Compute_ExternalVpnGatewayList + */ + public function listExternalVpnGateways($project, $optParams = array()) + { + $params = array('project' => $project); + $params = array_merge($params, $optParams); + return $this->call('list', array($params), "Google_Service_Compute_ExternalVpnGatewayList"); + } + /** + * Sets the labels on an ExternalVpnGateway. To learn more about labels, read + * the Labeling Resources documentation. (externalVpnGateways.setLabels) + * + * @param string $project Project ID for this request. + * @param string $resource Name or id of the resource for this request. + * @param Google_Service_Compute_GlobalSetLabelsRequest $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_Compute_Operation + */ + public function setLabels($project, $resource, Google_Service_Compute_GlobalSetLabelsRequest $postBody, $optParams = array()) + { + $params = array('project' => $project, 'resource' => $resource, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('setLabels', array($params), "Google_Service_Compute_Operation"); + } + /** + * Returns permissions that a caller has on the specified resource. + * (externalVpnGateways.testIamPermissions) + * + * @param string $project Project ID for this request. + * @param string $resource Name or id of the resource for this request. + * @param Google_Service_Compute_TestPermissionsRequest $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_Compute_TestPermissionsResponse + */ + public function testIamPermissions($project, $resource, Google_Service_Compute_TestPermissionsRequest $postBody, $optParams = array()) + { + $params = array('project' => $project, 'resource' => $resource, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('testIamPermissions', array($params), "Google_Service_Compute_TestPermissionsResponse"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/HealthChecks.php b/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/HealthChecks.php index 6e28497..2917d73 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/HealthChecks.php +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/HealthChecks.php @@ -25,6 +25,59 @@ */ class Google_Service_Compute_Resource_HealthChecks extends Google_Service_Resource { + /** + * Retrieves the list of all HealthCheck resources, regional and global, + * available to the specified project. (healthChecks.aggregatedList) + * + * @param string $project Name of the project scoping this request. + * @param array $optParams Optional parameters. + * + * @opt_param string filter A filter expression that filters resources listed in + * the response. The expression must specify the field name, a comparison + * operator, and the value that you want to use for filtering. The value must be + * a string, a number, or a boolean. The comparison operator must be either =, + * !=, >, or <. + * + * For example, if you are filtering Compute Engine instances, you can exclude + * instances named example-instance by specifying name != example-instance. + * + * You can also filter nested fields. For example, you could specify + * scheduling.automaticRestart = false to include instances only if they are not + * scheduled for automatic restarts. You can use filtering on nested fields to + * filter based on resource labels. + * + * To filter on multiple expressions, provide each separate expression within + * parentheses. For example, (scheduling.automaticRestart = true) (cpuPlatform = + * "Intel Skylake"). By default, each expression is an AND expression. However, + * you can include AND and OR expressions explicitly. For example, (cpuPlatform + * = "Intel Skylake") OR (cpuPlatform = "Intel Broadwell") AND + * (scheduling.automaticRestart = true). + * @opt_param string maxResults The maximum number of results per page that + * should be returned. If the number of available results is larger than + * maxResults, Compute Engine returns a nextPageToken that can be used to get + * the next page of results in subsequent list requests. Acceptable values are 0 + * to 500, inclusive. (Default: 500) + * @opt_param string orderBy Sorts list results by a certain order. By default, + * results are returned in alphanumerical order based on the resource name. + * + * You can also sort results in descending order based on the creation timestamp + * using orderBy="creationTimestamp desc". This sorts results based on the + * creationTimestamp field in reverse chronological order (newest result first). + * Use this to sort resources like operations so that the newest operation is + * returned first. + * + * Currently, only sorting by name or creationTimestamp desc is supported. + * @opt_param string pageToken Specifies a page token to use. Set pageToken to + * the nextPageToken returned by a previous list request to get the next page of + * results. + * @return Google_Service_Compute_HealthChecksAggregatedList + */ + public function aggregatedList($project, $optParams = array()) + { + $params = array('project' => $project); + $params = array_merge($params, $optParams); + return $this->call('aggregatedList', array($params), "Google_Service_Compute_HealthChecksAggregatedList"); + } /** * Deletes the specified HealthCheck resource. (healthChecks.delete) * diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/Instances.php b/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/Instances.php index 81534a4..517ca56 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/Instances.php +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/Instances.php @@ -1015,6 +1015,37 @@ class Google_Service_Compute_Resource_Instances extends Google_Service_Resource $params = array_merge($params, $optParams); return $this->call('updateAccessConfig', array($params), "Google_Service_Compute_Operation"); } + /** + * Updates the Display config for a VM instance. You can only use this method on + * a stopped VM instance. This method supports PATCH semantics and uses the JSON + * merge patch format and processing rules. (instances.updateDisplayDevice) + * + * @param string $project Project ID for this request. + * @param string $zone The name of the zone for this request. + * @param string $instance Name of the instance scoping this request. + * @param Google_Service_Compute_DisplayDevice $postBody + * @param array $optParams Optional parameters. + * + * @opt_param string requestId An optional request ID to identify requests. + * Specify a unique request ID so that if you must retry your request, the + * server will know to ignore the request if it has already been completed. + * + * For example, consider a situation where you make an initial request and the + * request times out. If you make the request again with the same request ID, + * the server can check if original operation with the same request ID was + * received, and if so, will ignore the second request. This prevents clients + * from accidentally creating duplicate commitments. + * + * The request ID must be a valid UUID with the exception that zero UUID is not + * supported (00000000-0000-0000-0000-000000000000). + * @return Google_Service_Compute_Operation + */ + public function updateDisplayDevice($project, $zone, $instance, Google_Service_Compute_DisplayDevice $postBody, $optParams = array()) + { + $params = array('project' => $project, 'zone' => $zone, 'instance' => $instance, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('updateDisplayDevice', array($params), "Google_Service_Compute_Operation"); + } /** * Updates an instance's network interface. This method follows PATCH semantics. * (instances.updateNetworkInterface) diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/Networks.php b/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/Networks.php index 6c1c366..17060da 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/Networks.php +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/Networks.php @@ -261,4 +261,36 @@ class Google_Service_Compute_Resource_Networks extends Google_Service_Resource $params = array_merge($params, $optParams); return $this->call('switchToCustomMode', array($params), "Google_Service_Compute_Operation"); } + /** + * Updates the specified network peering with the data included in the request + * Only the following fields can be modified: + * NetworkPeering.export_custom_routes, and NetworkPeering.import_custom_routes + * (networks.updatePeering) + * + * @param string $project Project ID for this request. + * @param string $network Name of the network resource which the updated peering + * is belonging to. + * @param Google_Service_Compute_NetworksUpdatePeeringRequest $postBody + * @param array $optParams Optional parameters. + * + * @opt_param string requestId An optional request ID to identify requests. + * Specify a unique request ID so that if you must retry your request, the + * server will know to ignore the request if it has already been completed. + * + * For example, consider a situation where you make an initial request and the + * request times out. If you make the request again with the same request ID, + * the server can check if original operation with the same request ID was + * received, and if so, will ignore the second request. This prevents clients + * from accidentally creating duplicate commitments. + * + * The request ID must be a valid UUID with the exception that zero UUID is not + * supported (00000000-0000-0000-0000-000000000000). + * @return Google_Service_Compute_Operation + */ + public function updatePeering($project, $network, Google_Service_Compute_NetworksUpdatePeeringRequest $postBody, $optParams = array()) + { + $params = array('project' => $project, 'network' => $network, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('updatePeering', array($params), "Google_Service_Compute_Operation"); + } } diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/NodeGroups.php b/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/NodeGroups.php index 90c192a..2e21391 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/NodeGroups.php +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/NodeGroups.php @@ -140,7 +140,8 @@ class Google_Service_Compute_Resource_NodeGroups extends Google_Service_Resource * * @param string $project Project ID for this request. * @param string $zone The name of the zone for this request. - * @param string $nodeGroup Name of the NodeGroup resource to delete. + * @param string $nodeGroup Name of the NodeGroup resource whose nodes will be + * deleted. * @param Google_Service_Compute_NodeGroupsDeleteNodesRequest $postBody * @param array $optParams Optional parameters. * diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/RegionHealthChecks.php b/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/RegionHealthChecks.php new file mode 100644 index 0000000..7e04a76 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/RegionHealthChecks.php @@ -0,0 +1,216 @@ + + * $computeService = new Google_Service_Compute(...); + * $regionHealthChecks = $computeService->regionHealthChecks; + * + */ +class Google_Service_Compute_Resource_RegionHealthChecks extends Google_Service_Resource +{ + /** + * Deletes the specified HealthCheck resource. (regionHealthChecks.delete) + * + * @param string $project Project ID for this request. + * @param string $region Name of the region scoping this request. + * @param string $healthCheck Name of the HealthCheck resource to delete. + * @param array $optParams Optional parameters. + * + * @opt_param string requestId An optional request ID to identify requests. + * Specify a unique request ID so that if you must retry your request, the + * server will know to ignore the request if it has already been completed. + * + * For example, consider a situation where you make an initial request and the + * request times out. If you make the request again with the same request ID, + * the server can check if original operation with the same request ID was + * received, and if so, will ignore the second request. This prevents clients + * from accidentally creating duplicate commitments. + * + * The request ID must be a valid UUID with the exception that zero UUID is not + * supported (00000000-0000-0000-0000-000000000000). + * @return Google_Service_Compute_Operation + */ + public function delete($project, $region, $healthCheck, $optParams = array()) + { + $params = array('project' => $project, 'region' => $region, 'healthCheck' => $healthCheck); + $params = array_merge($params, $optParams); + return $this->call('delete', array($params), "Google_Service_Compute_Operation"); + } + /** + * Returns the specified HealthCheck resource. Gets a list of available health + * checks by making a list() request. (regionHealthChecks.get) + * + * @param string $project Project ID for this request. + * @param string $region Name of the region scoping this request. + * @param string $healthCheck Name of the HealthCheck resource to return. + * @param array $optParams Optional parameters. + * @return Google_Service_Compute_HealthCheck + */ + public function get($project, $region, $healthCheck, $optParams = array()) + { + $params = array('project' => $project, 'region' => $region, 'healthCheck' => $healthCheck); + $params = array_merge($params, $optParams); + return $this->call('get', array($params), "Google_Service_Compute_HealthCheck"); + } + /** + * Creates a HealthCheck resource in the specified project using the data + * included in the request. (regionHealthChecks.insert) + * + * @param string $project Project ID for this request. + * @param string $region Name of the region scoping this request. + * @param Google_Service_Compute_HealthCheck $postBody + * @param array $optParams Optional parameters. + * + * @opt_param string requestId An optional request ID to identify requests. + * Specify a unique request ID so that if you must retry your request, the + * server will know to ignore the request if it has already been completed. + * + * For example, consider a situation where you make an initial request and the + * request times out. If you make the request again with the same request ID, + * the server can check if original operation with the same request ID was + * received, and if so, will ignore the second request. This prevents clients + * from accidentally creating duplicate commitments. + * + * The request ID must be a valid UUID with the exception that zero UUID is not + * supported (00000000-0000-0000-0000-000000000000). + * @return Google_Service_Compute_Operation + */ + public function insert($project, $region, Google_Service_Compute_HealthCheck $postBody, $optParams = array()) + { + $params = array('project' => $project, 'region' => $region, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('insert', array($params), "Google_Service_Compute_Operation"); + } + /** + * Retrieves the list of HealthCheck resources available to the specified + * project. (regionHealthChecks.listRegionHealthChecks) + * + * @param string $project Project ID for this request. + * @param string $region Name of the region scoping this request. + * @param array $optParams Optional parameters. + * + * @opt_param string filter A filter expression that filters resources listed in + * the response. The expression must specify the field name, a comparison + * operator, and the value that you want to use for filtering. The value must be + * a string, a number, or a boolean. The comparison operator must be either =, + * !=, >, or <. + * + * For example, if you are filtering Compute Engine instances, you can exclude + * instances named example-instance by specifying name != example-instance. + * + * You can also filter nested fields. For example, you could specify + * scheduling.automaticRestart = false to include instances only if they are not + * scheduled for automatic restarts. You can use filtering on nested fields to + * filter based on resource labels. + * + * To filter on multiple expressions, provide each separate expression within + * parentheses. For example, (scheduling.automaticRestart = true) (cpuPlatform = + * "Intel Skylake"). By default, each expression is an AND expression. However, + * you can include AND and OR expressions explicitly. For example, (cpuPlatform + * = "Intel Skylake") OR (cpuPlatform = "Intel Broadwell") AND + * (scheduling.automaticRestart = true). + * @opt_param string maxResults The maximum number of results per page that + * should be returned. If the number of available results is larger than + * maxResults, Compute Engine returns a nextPageToken that can be used to get + * the next page of results in subsequent list requests. Acceptable values are 0 + * to 500, inclusive. (Default: 500) + * @opt_param string orderBy Sorts list results by a certain order. By default, + * results are returned in alphanumerical order based on the resource name. + * + * You can also sort results in descending order based on the creation timestamp + * using orderBy="creationTimestamp desc". This sorts results based on the + * creationTimestamp field in reverse chronological order (newest result first). + * Use this to sort resources like operations so that the newest operation is + * returned first. + * + * Currently, only sorting by name or creationTimestamp desc is supported. + * @opt_param string pageToken Specifies a page token to use. Set pageToken to + * the nextPageToken returned by a previous list request to get the next page of + * results. + * @return Google_Service_Compute_HealthCheckList + */ + public function listRegionHealthChecks($project, $region, $optParams = array()) + { + $params = array('project' => $project, 'region' => $region); + $params = array_merge($params, $optParams); + return $this->call('list', array($params), "Google_Service_Compute_HealthCheckList"); + } + /** + * Updates a HealthCheck resource in the specified project using the data + * included in the request. This method supports PATCH semantics and uses the + * JSON merge patch format and processing rules. (regionHealthChecks.patch) + * + * @param string $project Project ID for this request. + * @param string $region Name of the region scoping this request. + * @param string $healthCheck Name of the HealthCheck resource to patch. + * @param Google_Service_Compute_HealthCheck $postBody + * @param array $optParams Optional parameters. + * + * @opt_param string requestId An optional request ID to identify requests. + * Specify a unique request ID so that if you must retry your request, the + * server will know to ignore the request if it has already been completed. + * + * For example, consider a situation where you make an initial request and the + * request times out. If you make the request again with the same request ID, + * the server can check if original operation with the same request ID was + * received, and if so, will ignore the second request. This prevents clients + * from accidentally creating duplicate commitments. + * + * The request ID must be a valid UUID with the exception that zero UUID is not + * supported (00000000-0000-0000-0000-000000000000). + * @return Google_Service_Compute_Operation + */ + public function patch($project, $region, $healthCheck, Google_Service_Compute_HealthCheck $postBody, $optParams = array()) + { + $params = array('project' => $project, 'region' => $region, 'healthCheck' => $healthCheck, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('patch', array($params), "Google_Service_Compute_Operation"); + } + /** + * Updates a HealthCheck resource in the specified project using the data + * included in the request. (regionHealthChecks.update) + * + * @param string $project Project ID for this request. + * @param string $region Name of the region scoping this request. + * @param string $healthCheck Name of the HealthCheck resource to update. + * @param Google_Service_Compute_HealthCheck $postBody + * @param array $optParams Optional parameters. + * + * @opt_param string requestId An optional request ID to identify requests. + * Specify a unique request ID so that if you must retry your request, the + * server will know to ignore the request if it has already been completed. + * + * For example, consider a situation where you make an initial request and the + * request times out. If you make the request again with the same request ID, + * the server can check if original operation with the same request ID was + * received, and if so, will ignore the second request. This prevents clients + * from accidentally creating duplicate commitments. + * + * The request ID must be a valid UUID with the exception that zero UUID is not + * supported (00000000-0000-0000-0000-000000000000). + * @return Google_Service_Compute_Operation + */ + public function update($project, $region, $healthCheck, Google_Service_Compute_HealthCheck $postBody, $optParams = array()) + { + $params = array('project' => $project, 'region' => $region, 'healthCheck' => $healthCheck, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('update', array($params), "Google_Service_Compute_Operation"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/RegionSslCertificates.php b/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/RegionSslCertificates.php new file mode 100644 index 0000000..b7eb025 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/RegionSslCertificates.php @@ -0,0 +1,158 @@ + + * $computeService = new Google_Service_Compute(...); + * $regionSslCertificates = $computeService->regionSslCertificates; + * + */ +class Google_Service_Compute_Resource_RegionSslCertificates extends Google_Service_Resource +{ + /** + * Deletes the specified SslCertificate resource in the region. + * (regionSslCertificates.delete) + * + * @param string $project Project ID for this request. + * @param string $region Name of the region scoping this request. + * @param string $sslCertificate Name of the SslCertificate resource to delete. + * @param array $optParams Optional parameters. + * + * @opt_param string requestId An optional request ID to identify requests. + * Specify a unique request ID so that if you must retry your request, the + * server will know to ignore the request if it has already been completed. + * + * For example, consider a situation where you make an initial request and the + * request times out. If you make the request again with the same request ID, + * the server can check if original operation with the same request ID was + * received, and if so, will ignore the second request. This prevents clients + * from accidentally creating duplicate commitments. + * + * The request ID must be a valid UUID with the exception that zero UUID is not + * supported (00000000-0000-0000-0000-000000000000). + * @return Google_Service_Compute_Operation + */ + public function delete($project, $region, $sslCertificate, $optParams = array()) + { + $params = array('project' => $project, 'region' => $region, 'sslCertificate' => $sslCertificate); + $params = array_merge($params, $optParams); + return $this->call('delete', array($params), "Google_Service_Compute_Operation"); + } + /** + * Returns the specified SslCertificate resource in the specified region. Get a + * list of available SSL certificates by making a list() request. + * (regionSslCertificates.get) + * + * @param string $project Project ID for this request. + * @param string $region Name of the region scoping this request. + * @param string $sslCertificate Name of the SslCertificate resource to return. + * @param array $optParams Optional parameters. + * @return Google_Service_Compute_SslCertificate + */ + public function get($project, $region, $sslCertificate, $optParams = array()) + { + $params = array('project' => $project, 'region' => $region, 'sslCertificate' => $sslCertificate); + $params = array_merge($params, $optParams); + return $this->call('get', array($params), "Google_Service_Compute_SslCertificate"); + } + /** + * Creates a SslCertificate resource in the specified project and region using + * the data included in the request (regionSslCertificates.insert) + * + * @param string $project Project ID for this request. + * @param string $region Name of the region scoping this request. + * @param Google_Service_Compute_SslCertificate $postBody + * @param array $optParams Optional parameters. + * + * @opt_param string requestId An optional request ID to identify requests. + * Specify a unique request ID so that if you must retry your request, the + * server will know to ignore the request if it has already been completed. + * + * For example, consider a situation where you make an initial request and the + * request times out. If you make the request again with the same request ID, + * the server can check if original operation with the same request ID was + * received, and if so, will ignore the second request. This prevents clients + * from accidentally creating duplicate commitments. + * + * The request ID must be a valid UUID with the exception that zero UUID is not + * supported (00000000-0000-0000-0000-000000000000). + * @return Google_Service_Compute_Operation + */ + public function insert($project, $region, Google_Service_Compute_SslCertificate $postBody, $optParams = array()) + { + $params = array('project' => $project, 'region' => $region, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('insert', array($params), "Google_Service_Compute_Operation"); + } + /** + * Retrieves the list of SslCertificate resources available to the specified + * project in the specified region. + * (regionSslCertificates.listRegionSslCertificates) + * + * @param string $project Project ID for this request. + * @param string $region Name of the region scoping this request. + * @param array $optParams Optional parameters. + * + * @opt_param string filter A filter expression that filters resources listed in + * the response. The expression must specify the field name, a comparison + * operator, and the value that you want to use for filtering. The value must be + * a string, a number, or a boolean. The comparison operator must be either =, + * !=, >, or <. + * + * For example, if you are filtering Compute Engine instances, you can exclude + * instances named example-instance by specifying name != example-instance. + * + * You can also filter nested fields. For example, you could specify + * scheduling.automaticRestart = false to include instances only if they are not + * scheduled for automatic restarts. You can use filtering on nested fields to + * filter based on resource labels. + * + * To filter on multiple expressions, provide each separate expression within + * parentheses. For example, (scheduling.automaticRestart = true) (cpuPlatform = + * "Intel Skylake"). By default, each expression is an AND expression. However, + * you can include AND and OR expressions explicitly. For example, (cpuPlatform + * = "Intel Skylake") OR (cpuPlatform = "Intel Broadwell") AND + * (scheduling.automaticRestart = true). + * @opt_param string maxResults The maximum number of results per page that + * should be returned. If the number of available results is larger than + * maxResults, Compute Engine returns a nextPageToken that can be used to get + * the next page of results in subsequent list requests. Acceptable values are 0 + * to 500, inclusive. (Default: 500) + * @opt_param string orderBy Sorts list results by a certain order. By default, + * results are returned in alphanumerical order based on the resource name. + * + * You can also sort results in descending order based on the creation timestamp + * using orderBy="creationTimestamp desc". This sorts results based on the + * creationTimestamp field in reverse chronological order (newest result first). + * Use this to sort resources like operations so that the newest operation is + * returned first. + * + * Currently, only sorting by name or creationTimestamp desc is supported. + * @opt_param string pageToken Specifies a page token to use. Set pageToken to + * the nextPageToken returned by a previous list request to get the next page of + * results. + * @return Google_Service_Compute_SslCertificateList + */ + public function listRegionSslCertificates($project, $region, $optParams = array()) + { + $params = array('project' => $project, 'region' => $region); + $params = array_merge($params, $optParams); + return $this->call('list', array($params), "Google_Service_Compute_SslCertificateList"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/RegionTargetHttpProxies.php b/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/RegionTargetHttpProxies.php new file mode 100644 index 0000000..5968a1c --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/RegionTargetHttpProxies.php @@ -0,0 +1,190 @@ + + * $computeService = new Google_Service_Compute(...); + * $regionTargetHttpProxies = $computeService->regionTargetHttpProxies; + * + */ +class Google_Service_Compute_Resource_RegionTargetHttpProxies extends Google_Service_Resource +{ + /** + * Deletes the specified TargetHttpProxy resource. + * (regionTargetHttpProxies.delete) + * + * @param string $project Project ID for this request. + * @param string $region Name of the region scoping this request. + * @param string $targetHttpProxy Name of the TargetHttpProxy resource to + * delete. + * @param array $optParams Optional parameters. + * + * @opt_param string requestId An optional request ID to identify requests. + * Specify a unique request ID so that if you must retry your request, the + * server will know to ignore the request if it has already been completed. + * + * For example, consider a situation where you make an initial request and the + * request times out. If you make the request again with the same request ID, + * the server can check if original operation with the same request ID was + * received, and if so, will ignore the second request. This prevents clients + * from accidentally creating duplicate commitments. + * + * The request ID must be a valid UUID with the exception that zero UUID is not + * supported (00000000-0000-0000-0000-000000000000). + * @return Google_Service_Compute_Operation + */ + public function delete($project, $region, $targetHttpProxy, $optParams = array()) + { + $params = array('project' => $project, 'region' => $region, 'targetHttpProxy' => $targetHttpProxy); + $params = array_merge($params, $optParams); + return $this->call('delete', array($params), "Google_Service_Compute_Operation"); + } + /** + * Returns the specified TargetHttpProxy resource in the specified region. Gets + * a list of available target HTTP proxies by making a list() request. + * (regionTargetHttpProxies.get) + * + * @param string $project Project ID for this request. + * @param string $region Name of the region scoping this request. + * @param string $targetHttpProxy Name of the TargetHttpProxy resource to + * return. + * @param array $optParams Optional parameters. + * @return Google_Service_Compute_TargetHttpProxy + */ + public function get($project, $region, $targetHttpProxy, $optParams = array()) + { + $params = array('project' => $project, 'region' => $region, 'targetHttpProxy' => $targetHttpProxy); + $params = array_merge($params, $optParams); + return $this->call('get', array($params), "Google_Service_Compute_TargetHttpProxy"); + } + /** + * Creates a TargetHttpProxy resource in the specified project and region using + * the data included in the request. (regionTargetHttpProxies.insert) + * + * @param string $project Project ID for this request. + * @param string $region Name of the region scoping this request. + * @param Google_Service_Compute_TargetHttpProxy $postBody + * @param array $optParams Optional parameters. + * + * @opt_param string requestId An optional request ID to identify requests. + * Specify a unique request ID so that if you must retry your request, the + * server will know to ignore the request if it has already been completed. + * + * For example, consider a situation where you make an initial request and the + * request times out. If you make the request again with the same request ID, + * the server can check if original operation with the same request ID was + * received, and if so, will ignore the second request. This prevents clients + * from accidentally creating duplicate commitments. + * + * The request ID must be a valid UUID with the exception that zero UUID is not + * supported (00000000-0000-0000-0000-000000000000). + * @return Google_Service_Compute_Operation + */ + public function insert($project, $region, Google_Service_Compute_TargetHttpProxy $postBody, $optParams = array()) + { + $params = array('project' => $project, 'region' => $region, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('insert', array($params), "Google_Service_Compute_Operation"); + } + /** + * Retrieves the list of TargetHttpProxy resources available to the specified + * project in the specified region. + * (regionTargetHttpProxies.listRegionTargetHttpProxies) + * + * @param string $project Project ID for this request. + * @param string $region Name of the region scoping this request. + * @param array $optParams Optional parameters. + * + * @opt_param string filter A filter expression that filters resources listed in + * the response. The expression must specify the field name, a comparison + * operator, and the value that you want to use for filtering. The value must be + * a string, a number, or a boolean. The comparison operator must be either =, + * !=, >, or <. + * + * For example, if you are filtering Compute Engine instances, you can exclude + * instances named example-instance by specifying name != example-instance. + * + * You can also filter nested fields. For example, you could specify + * scheduling.automaticRestart = false to include instances only if they are not + * scheduled for automatic restarts. You can use filtering on nested fields to + * filter based on resource labels. + * + * To filter on multiple expressions, provide each separate expression within + * parentheses. For example, (scheduling.automaticRestart = true) (cpuPlatform = + * "Intel Skylake"). By default, each expression is an AND expression. However, + * you can include AND and OR expressions explicitly. For example, (cpuPlatform + * = "Intel Skylake") OR (cpuPlatform = "Intel Broadwell") AND + * (scheduling.automaticRestart = true). + * @opt_param string maxResults The maximum number of results per page that + * should be returned. If the number of available results is larger than + * maxResults, Compute Engine returns a nextPageToken that can be used to get + * the next page of results in subsequent list requests. Acceptable values are 0 + * to 500, inclusive. (Default: 500) + * @opt_param string orderBy Sorts list results by a certain order. By default, + * results are returned in alphanumerical order based on the resource name. + * + * You can also sort results in descending order based on the creation timestamp + * using orderBy="creationTimestamp desc". This sorts results based on the + * creationTimestamp field in reverse chronological order (newest result first). + * Use this to sort resources like operations so that the newest operation is + * returned first. + * + * Currently, only sorting by name or creationTimestamp desc is supported. + * @opt_param string pageToken Specifies a page token to use. Set pageToken to + * the nextPageToken returned by a previous list request to get the next page of + * results. + * @return Google_Service_Compute_TargetHttpProxyList + */ + public function listRegionTargetHttpProxies($project, $region, $optParams = array()) + { + $params = array('project' => $project, 'region' => $region); + $params = array_merge($params, $optParams); + return $this->call('list', array($params), "Google_Service_Compute_TargetHttpProxyList"); + } + /** + * Changes the URL map for TargetHttpProxy. (regionTargetHttpProxies.setUrlMap) + * + * @param string $project Project ID for this request. + * @param string $region Name of the region scoping this request. + * @param string $targetHttpProxy Name of the TargetHttpProxy to set a URL map + * for. + * @param Google_Service_Compute_UrlMapReference $postBody + * @param array $optParams Optional parameters. + * + * @opt_param string requestId An optional request ID to identify requests. + * Specify a unique request ID so that if you must retry your request, the + * server will know to ignore the request if it has already been completed. + * + * For example, consider a situation where you make an initial request and the + * request times out. If you make the request again with the same request ID, + * the server can check if original operation with the same request ID was + * received, and if so, will ignore the second request. This prevents clients + * from accidentally creating duplicate commitments. + * + * The request ID must be a valid UUID with the exception that zero UUID is not + * supported (00000000-0000-0000-0000-000000000000). + * @return Google_Service_Compute_Operation + */ + public function setUrlMap($project, $region, $targetHttpProxy, Google_Service_Compute_UrlMapReference $postBody, $optParams = array()) + { + $params = array('project' => $project, 'region' => $region, 'targetHttpProxy' => $targetHttpProxy, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('setUrlMap', array($params), "Google_Service_Compute_Operation"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/RegionTargetHttpsProxies.php b/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/RegionTargetHttpsProxies.php new file mode 100644 index 0000000..7729477 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/RegionTargetHttpsProxies.php @@ -0,0 +1,222 @@ + + * $computeService = new Google_Service_Compute(...); + * $regionTargetHttpsProxies = $computeService->regionTargetHttpsProxies; + * + */ +class Google_Service_Compute_Resource_RegionTargetHttpsProxies extends Google_Service_Resource +{ + /** + * Deletes the specified TargetHttpsProxy resource. + * (regionTargetHttpsProxies.delete) + * + * @param string $project Project ID for this request. + * @param string $region Name of the region scoping this request. + * @param string $targetHttpsProxy Name of the TargetHttpsProxy resource to + * delete. + * @param array $optParams Optional parameters. + * + * @opt_param string requestId An optional request ID to identify requests. + * Specify a unique request ID so that if you must retry your request, the + * server will know to ignore the request if it has already been completed. + * + * For example, consider a situation where you make an initial request and the + * request times out. If you make the request again with the same request ID, + * the server can check if original operation with the same request ID was + * received, and if so, will ignore the second request. This prevents clients + * from accidentally creating duplicate commitments. + * + * The request ID must be a valid UUID with the exception that zero UUID is not + * supported (00000000-0000-0000-0000-000000000000). + * @return Google_Service_Compute_Operation + */ + public function delete($project, $region, $targetHttpsProxy, $optParams = array()) + { + $params = array('project' => $project, 'region' => $region, 'targetHttpsProxy' => $targetHttpsProxy); + $params = array_merge($params, $optParams); + return $this->call('delete', array($params), "Google_Service_Compute_Operation"); + } + /** + * Returns the specified TargetHttpsProxy resource in the specified region. Gets + * a list of available target HTTP proxies by making a list() request. + * (regionTargetHttpsProxies.get) + * + * @param string $project Project ID for this request. + * @param string $region Name of the region scoping this request. + * @param string $targetHttpsProxy Name of the TargetHttpsProxy resource to + * return. + * @param array $optParams Optional parameters. + * @return Google_Service_Compute_TargetHttpsProxy + */ + public function get($project, $region, $targetHttpsProxy, $optParams = array()) + { + $params = array('project' => $project, 'region' => $region, 'targetHttpsProxy' => $targetHttpsProxy); + $params = array_merge($params, $optParams); + return $this->call('get', array($params), "Google_Service_Compute_TargetHttpsProxy"); + } + /** + * Creates a TargetHttpsProxy resource in the specified project and region using + * the data included in the request. (regionTargetHttpsProxies.insert) + * + * @param string $project Project ID for this request. + * @param string $region Name of the region scoping this request. + * @param Google_Service_Compute_TargetHttpsProxy $postBody + * @param array $optParams Optional parameters. + * + * @opt_param string requestId An optional request ID to identify requests. + * Specify a unique request ID so that if you must retry your request, the + * server will know to ignore the request if it has already been completed. + * + * For example, consider a situation where you make an initial request and the + * request times out. If you make the request again with the same request ID, + * the server can check if original operation with the same request ID was + * received, and if so, will ignore the second request. This prevents clients + * from accidentally creating duplicate commitments. + * + * The request ID must be a valid UUID with the exception that zero UUID is not + * supported (00000000-0000-0000-0000-000000000000). + * @return Google_Service_Compute_Operation + */ + public function insert($project, $region, Google_Service_Compute_TargetHttpsProxy $postBody, $optParams = array()) + { + $params = array('project' => $project, 'region' => $region, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('insert', array($params), "Google_Service_Compute_Operation"); + } + /** + * Retrieves the list of TargetHttpsProxy resources available to the specified + * project in the specified region. + * (regionTargetHttpsProxies.listRegionTargetHttpsProxies) + * + * @param string $project Project ID for this request. + * @param string $region Name of the region scoping this request. + * @param array $optParams Optional parameters. + * + * @opt_param string filter A filter expression that filters resources listed in + * the response. The expression must specify the field name, a comparison + * operator, and the value that you want to use for filtering. The value must be + * a string, a number, or a boolean. The comparison operator must be either =, + * !=, >, or <. + * + * For example, if you are filtering Compute Engine instances, you can exclude + * instances named example-instance by specifying name != example-instance. + * + * You can also filter nested fields. For example, you could specify + * scheduling.automaticRestart = false to include instances only if they are not + * scheduled for automatic restarts. You can use filtering on nested fields to + * filter based on resource labels. + * + * To filter on multiple expressions, provide each separate expression within + * parentheses. For example, (scheduling.automaticRestart = true) (cpuPlatform = + * "Intel Skylake"). By default, each expression is an AND expression. However, + * you can include AND and OR expressions explicitly. For example, (cpuPlatform + * = "Intel Skylake") OR (cpuPlatform = "Intel Broadwell") AND + * (scheduling.automaticRestart = true). + * @opt_param string maxResults The maximum number of results per page that + * should be returned. If the number of available results is larger than + * maxResults, Compute Engine returns a nextPageToken that can be used to get + * the next page of results in subsequent list requests. Acceptable values are 0 + * to 500, inclusive. (Default: 500) + * @opt_param string orderBy Sorts list results by a certain order. By default, + * results are returned in alphanumerical order based on the resource name. + * + * You can also sort results in descending order based on the creation timestamp + * using orderBy="creationTimestamp desc". This sorts results based on the + * creationTimestamp field in reverse chronological order (newest result first). + * Use this to sort resources like operations so that the newest operation is + * returned first. + * + * Currently, only sorting by name or creationTimestamp desc is supported. + * @opt_param string pageToken Specifies a page token to use. Set pageToken to + * the nextPageToken returned by a previous list request to get the next page of + * results. + * @return Google_Service_Compute_TargetHttpsProxyList + */ + public function listRegionTargetHttpsProxies($project, $region, $optParams = array()) + { + $params = array('project' => $project, 'region' => $region); + $params = array_merge($params, $optParams); + return $this->call('list', array($params), "Google_Service_Compute_TargetHttpsProxyList"); + } + /** + * Replaces SslCertificates for TargetHttpsProxy. + * (regionTargetHttpsProxies.setSslCertificates) + * + * @param string $project Project ID for this request. + * @param string $region Name of the region scoping this request. + * @param string $targetHttpsProxy Name of the TargetHttpsProxy resource to set + * an SslCertificates resource for. + * @param Google_Service_Compute_RegionTargetHttpsProxiesSetSslCertificatesRequest $postBody + * @param array $optParams Optional parameters. + * + * @opt_param string requestId An optional request ID to identify requests. + * Specify a unique request ID so that if you must retry your request, the + * server will know to ignore the request if it has already been completed. + * + * For example, consider a situation where you make an initial request and the + * request times out. If you make the request again with the same request ID, + * the server can check if original operation with the same request ID was + * received, and if so, will ignore the second request. This prevents clients + * from accidentally creating duplicate commitments. + * + * The request ID must be a valid UUID with the exception that zero UUID is not + * supported (00000000-0000-0000-0000-000000000000). + * @return Google_Service_Compute_Operation + */ + public function setSslCertificates($project, $region, $targetHttpsProxy, Google_Service_Compute_RegionTargetHttpsProxiesSetSslCertificatesRequest $postBody, $optParams = array()) + { + $params = array('project' => $project, 'region' => $region, 'targetHttpsProxy' => $targetHttpsProxy, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('setSslCertificates', array($params), "Google_Service_Compute_Operation"); + } + /** + * Changes the URL map for TargetHttpsProxy. + * (regionTargetHttpsProxies.setUrlMap) + * + * @param string $project Project ID for this request. + * @param string $region Name of the region scoping this request. + * @param string $targetHttpsProxy Name of the TargetHttpsProxy to set a URL map + * for. + * @param Google_Service_Compute_UrlMapReference $postBody + * @param array $optParams Optional parameters. + * + * @opt_param string requestId An optional request ID to identify requests. + * Specify a unique request ID so that if you must retry your request, the + * server will know to ignore the request if it has already been completed. + * + * For example, consider a situation where you make an initial request and the + * request times out. If you make the request again with the same request ID, + * the server can check if original operation with the same request ID was + * received, and if so, will ignore the second request. This prevents clients + * from accidentally creating duplicate commitments. + * + * The request ID must be a valid UUID with the exception that zero UUID is not + * supported (00000000-0000-0000-0000-000000000000). + * @return Google_Service_Compute_Operation + */ + public function setUrlMap($project, $region, $targetHttpsProxy, Google_Service_Compute_UrlMapReference $postBody, $optParams = array()) + { + $params = array('project' => $project, 'region' => $region, 'targetHttpsProxy' => $targetHttpsProxy, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('setUrlMap', array($params), "Google_Service_Compute_Operation"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/RegionUrlMaps.php b/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/RegionUrlMaps.php new file mode 100644 index 0000000..d23f94c --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/RegionUrlMaps.php @@ -0,0 +1,194 @@ + + * $computeService = new Google_Service_Compute(...); + * $regionUrlMaps = $computeService->regionUrlMaps; + * + */ +class Google_Service_Compute_Resource_RegionUrlMaps extends Google_Service_Resource +{ + /** + * Deletes the specified UrlMap resource. (regionUrlMaps.delete) + * + * @param string $project Project ID for this request. + * @param string $region Name of the region scoping this request. + * @param string $urlMap Name of the UrlMap resource to delete. + * @param array $optParams Optional parameters. + * + * @opt_param string requestId begin_interface: MixerMutationRequestBuilder + * Request ID to support idempotency. + * @return Google_Service_Compute_Operation + */ + public function delete($project, $region, $urlMap, $optParams = array()) + { + $params = array('project' => $project, 'region' => $region, 'urlMap' => $urlMap); + $params = array_merge($params, $optParams); + return $this->call('delete', array($params), "Google_Service_Compute_Operation"); + } + /** + * Returns the specified UrlMap resource. Gets a list of available URL maps by + * making a list() request. (regionUrlMaps.get) + * + * @param string $project Project ID for this request. + * @param string $region Name of the region scoping this request. + * @param string $urlMap Name of the UrlMap resource to return. + * @param array $optParams Optional parameters. + * @return Google_Service_Compute_UrlMap + */ + public function get($project, $region, $urlMap, $optParams = array()) + { + $params = array('project' => $project, 'region' => $region, 'urlMap' => $urlMap); + $params = array_merge($params, $optParams); + return $this->call('get', array($params), "Google_Service_Compute_UrlMap"); + } + /** + * Creates a UrlMap resource in the specified project using the data included in + * the request. (regionUrlMaps.insert) + * + * @param string $project Project ID for this request. + * @param string $region Name of the region scoping this request. + * @param Google_Service_Compute_UrlMap $postBody + * @param array $optParams Optional parameters. + * + * @opt_param string requestId begin_interface: MixerMutationRequestBuilder + * Request ID to support idempotency. + * @return Google_Service_Compute_Operation + */ + public function insert($project, $region, Google_Service_Compute_UrlMap $postBody, $optParams = array()) + { + $params = array('project' => $project, 'region' => $region, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('insert', array($params), "Google_Service_Compute_Operation"); + } + /** + * Retrieves the list of UrlMap resources available to the specified project in + * the specified region. (regionUrlMaps.listRegionUrlMaps) + * + * @param string $project Project ID for this request. + * @param string $region Name of the region scoping this request. + * @param array $optParams Optional parameters. + * + * @opt_param string filter A filter expression that filters resources listed in + * the response. The expression must specify the field name, a comparison + * operator, and the value that you want to use for filtering. The value must be + * a string, a number, or a boolean. The comparison operator must be either =, + * !=, >, or <. + * + * For example, if you are filtering Compute Engine instances, you can exclude + * instances named example-instance by specifying name != example-instance. + * + * You can also filter nested fields. For example, you could specify + * scheduling.automaticRestart = false to include instances only if they are not + * scheduled for automatic restarts. You can use filtering on nested fields to + * filter based on resource labels. + * + * To filter on multiple expressions, provide each separate expression within + * parentheses. For example, (scheduling.automaticRestart = true) (cpuPlatform = + * "Intel Skylake"). By default, each expression is an AND expression. However, + * you can include AND and OR expressions explicitly. For example, (cpuPlatform + * = "Intel Skylake") OR (cpuPlatform = "Intel Broadwell") AND + * (scheduling.automaticRestart = true). + * @opt_param string maxResults The maximum number of results per page that + * should be returned. If the number of available results is larger than + * maxResults, Compute Engine returns a nextPageToken that can be used to get + * the next page of results in subsequent list requests. Acceptable values are 0 + * to 500, inclusive. (Default: 500) + * @opt_param string orderBy Sorts list results by a certain order. By default, + * results are returned in alphanumerical order based on the resource name. + * + * You can also sort results in descending order based on the creation timestamp + * using orderBy="creationTimestamp desc". This sorts results based on the + * creationTimestamp field in reverse chronological order (newest result first). + * Use this to sort resources like operations so that the newest operation is + * returned first. + * + * Currently, only sorting by name or creationTimestamp desc is supported. + * @opt_param string pageToken Specifies a page token to use. Set pageToken to + * the nextPageToken returned by a previous list request to get the next page of + * results. + * @return Google_Service_Compute_UrlMapList + */ + public function listRegionUrlMaps($project, $region, $optParams = array()) + { + $params = array('project' => $project, 'region' => $region); + $params = array_merge($params, $optParams); + return $this->call('list', array($params), "Google_Service_Compute_UrlMapList"); + } + /** + * Patches the specified UrlMap resource with the data included in the request. + * This method supports PATCH semantics and uses JSON merge patch format and + * processing rules. (regionUrlMaps.patch) + * + * @param string $project Project ID for this request. + * @param string $region Name of the region scoping this request. + * @param string $urlMap Name of the UrlMap resource to patch. + * @param Google_Service_Compute_UrlMap $postBody + * @param array $optParams Optional parameters. + * + * @opt_param string requestId begin_interface: MixerMutationRequestBuilder + * Request ID to support idempotency. + * @return Google_Service_Compute_Operation + */ + public function patch($project, $region, $urlMap, Google_Service_Compute_UrlMap $postBody, $optParams = array()) + { + $params = array('project' => $project, 'region' => $region, 'urlMap' => $urlMap, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('patch', array($params), "Google_Service_Compute_Operation"); + } + /** + * Updates the specified UrlMap resource with the data included in the request. + * (regionUrlMaps.update) + * + * @param string $project Project ID for this request. + * @param string $region Name of the region scoping this request. + * @param string $urlMap Name of the UrlMap resource to update. + * @param Google_Service_Compute_UrlMap $postBody + * @param array $optParams Optional parameters. + * + * @opt_param string requestId begin_interface: MixerMutationRequestBuilder + * Request ID to support idempotency. + * @return Google_Service_Compute_Operation + */ + public function update($project, $region, $urlMap, Google_Service_Compute_UrlMap $postBody, $optParams = array()) + { + $params = array('project' => $project, 'region' => $region, 'urlMap' => $urlMap, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('update', array($params), "Google_Service_Compute_Operation"); + } + /** + * Runs static validation for the UrlMap. In particular, the tests of the + * provided UrlMap will be run. Calling this method does NOT create the UrlMap. + * (regionUrlMaps.validate) + * + * @param string $project Project ID for this request. + * @param string $region Name of the region scoping this request. + * @param string $urlMap Name of the UrlMap resource to be validated as. + * @param Google_Service_Compute_RegionUrlMapsValidateRequest $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_Compute_UrlMapsValidateResponse + */ + public function validate($project, $region, $urlMap, Google_Service_Compute_RegionUrlMapsValidateRequest $postBody, $optParams = array()) + { + $params = array('project' => $project, 'region' => $region, 'urlMap' => $urlMap, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('validate', array($params), "Google_Service_Compute_UrlMapsValidateResponse"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/Reservations.php b/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/Reservations.php index 0e56520..ca32fd7 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/Reservations.php +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/Reservations.php @@ -106,7 +106,7 @@ class Google_Service_Compute_Resource_Reservations extends Google_Service_Resour return $this->call('delete', array($params), "Google_Service_Compute_Operation"); } /** - * Retrieves all information of the specified reservation. (reservations.get) + * Retrieves information about the specified reservation. (reservations.get) * * @param string $project Project ID for this request. * @param string $zone Name of the zone for this request. @@ -166,7 +166,7 @@ class Google_Service_Compute_Resource_Reservations extends Google_Service_Resour return $this->call('insert', array($params), "Google_Service_Compute_Operation"); } /** - * A list all the reservations that have been configured for the specified + * A list of all the reservations that have been configured for the specified * project in specified zone. (reservations.listReservations) * * @param string $project Project ID for this request. @@ -220,8 +220,8 @@ class Google_Service_Compute_Resource_Reservations extends Google_Service_Resour return $this->call('list', array($params), "Google_Service_Compute_ReservationList"); } /** - * Resizes the reservation (applicable to standalone reservations only) - * (reservations.resize) + * Resizes the reservation (applicable to standalone reservations only). For + * more information, read Modifying reservations. (reservations.resize) * * @param string $project Project ID for this request. * @param string $zone Name of the zone for this request. diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/SslCertificates.php b/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/SslCertificates.php index 969ee16..496b6de 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/SslCertificates.php +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/SslCertificates.php @@ -25,6 +25,59 @@ */ class Google_Service_Compute_Resource_SslCertificates extends Google_Service_Resource { + /** + * Retrieves the list of all SslCertificate resources, regional and global, + * available to the specified project. (sslCertificates.aggregatedList) + * + * @param string $project Name of the project scoping this request. + * @param array $optParams Optional parameters. + * + * @opt_param string filter A filter expression that filters resources listed in + * the response. The expression must specify the field name, a comparison + * operator, and the value that you want to use for filtering. The value must be + * a string, a number, or a boolean. The comparison operator must be either =, + * !=, >, or <. + * + * For example, if you are filtering Compute Engine instances, you can exclude + * instances named example-instance by specifying name != example-instance. + * + * You can also filter nested fields. For example, you could specify + * scheduling.automaticRestart = false to include instances only if they are not + * scheduled for automatic restarts. You can use filtering on nested fields to + * filter based on resource labels. + * + * To filter on multiple expressions, provide each separate expression within + * parentheses. For example, (scheduling.automaticRestart = true) (cpuPlatform = + * "Intel Skylake"). By default, each expression is an AND expression. However, + * you can include AND and OR expressions explicitly. For example, (cpuPlatform + * = "Intel Skylake") OR (cpuPlatform = "Intel Broadwell") AND + * (scheduling.automaticRestart = true). + * @opt_param string maxResults The maximum number of results per page that + * should be returned. If the number of available results is larger than + * maxResults, Compute Engine returns a nextPageToken that can be used to get + * the next page of results in subsequent list requests. Acceptable values are 0 + * to 500, inclusive. (Default: 500) + * @opt_param string orderBy Sorts list results by a certain order. By default, + * results are returned in alphanumerical order based on the resource name. + * + * You can also sort results in descending order based on the creation timestamp + * using orderBy="creationTimestamp desc". This sorts results based on the + * creationTimestamp field in reverse chronological order (newest result first). + * Use this to sort resources like operations so that the newest operation is + * returned first. + * + * Currently, only sorting by name or creationTimestamp desc is supported. + * @opt_param string pageToken Specifies a page token to use. Set pageToken to + * the nextPageToken returned by a previous list request to get the next page of + * results. + * @return Google_Service_Compute_SslCertificateAggregatedList + */ + public function aggregatedList($project, $optParams = array()) + { + $params = array('project' => $project); + $params = array_merge($params, $optParams); + return $this->call('aggregatedList', array($params), "Google_Service_Compute_SslCertificateAggregatedList"); + } /** * Deletes the specified SslCertificate resource. (sslCertificates.delete) * diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/Subnetworks.php b/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/Subnetworks.php index af4a126..0f8ecb1 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/Subnetworks.php +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/Subnetworks.php @@ -251,7 +251,9 @@ class Google_Service_Compute_Resource_Subnetworks extends Google_Service_Resourc return $this->call('list', array($params), "Google_Service_Compute_SubnetworkList"); } /** - * Retrieves an aggregated list of usable subnetworks. (subnetworks.listUsable) + * Retrieves an aggregated list of all usable subnetworks in the project. The + * list contains all of the subnetworks in the project and the subnetworks that + * were shared by a Shared VPC host project. (subnetworks.listUsable) * * @param string $project Project ID for this request. * @param array $optParams Optional parameters. diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/TargetHttpProxies.php b/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/TargetHttpProxies.php index 526b383..8bae1cc 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/TargetHttpProxies.php +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/TargetHttpProxies.php @@ -25,6 +25,59 @@ */ class Google_Service_Compute_Resource_TargetHttpProxies extends Google_Service_Resource { + /** + * Retrieves the list of all TargetHttpProxy resources, regional and global, + * available to the specified project. (targetHttpProxies.aggregatedList) + * + * @param string $project Name of the project scoping this request. + * @param array $optParams Optional parameters. + * + * @opt_param string filter A filter expression that filters resources listed in + * the response. The expression must specify the field name, a comparison + * operator, and the value that you want to use for filtering. The value must be + * a string, a number, or a boolean. The comparison operator must be either =, + * !=, >, or <. + * + * For example, if you are filtering Compute Engine instances, you can exclude + * instances named example-instance by specifying name != example-instance. + * + * You can also filter nested fields. For example, you could specify + * scheduling.automaticRestart = false to include instances only if they are not + * scheduled for automatic restarts. You can use filtering on nested fields to + * filter based on resource labels. + * + * To filter on multiple expressions, provide each separate expression within + * parentheses. For example, (scheduling.automaticRestart = true) (cpuPlatform = + * "Intel Skylake"). By default, each expression is an AND expression. However, + * you can include AND and OR expressions explicitly. For example, (cpuPlatform + * = "Intel Skylake") OR (cpuPlatform = "Intel Broadwell") AND + * (scheduling.automaticRestart = true). + * @opt_param string maxResults The maximum number of results per page that + * should be returned. If the number of available results is larger than + * maxResults, Compute Engine returns a nextPageToken that can be used to get + * the next page of results in subsequent list requests. Acceptable values are 0 + * to 500, inclusive. (Default: 500) + * @opt_param string orderBy Sorts list results by a certain order. By default, + * results are returned in alphanumerical order based on the resource name. + * + * You can also sort results in descending order based on the creation timestamp + * using orderBy="creationTimestamp desc". This sorts results based on the + * creationTimestamp field in reverse chronological order (newest result first). + * Use this to sort resources like operations so that the newest operation is + * returned first. + * + * Currently, only sorting by name or creationTimestamp desc is supported. + * @opt_param string pageToken Specifies a page token to use. Set pageToken to + * the nextPageToken returned by a previous list request to get the next page of + * results. + * @return Google_Service_Compute_TargetHttpProxyAggregatedList + */ + public function aggregatedList($project, $optParams = array()) + { + $params = array('project' => $project); + $params = array_merge($params, $optParams); + return $this->call('aggregatedList', array($params), "Google_Service_Compute_TargetHttpProxyAggregatedList"); + } /** * Deletes the specified TargetHttpProxy resource. (targetHttpProxies.delete) * diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/TargetHttpsProxies.php b/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/TargetHttpsProxies.php index fb3a889..01f3d76 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/TargetHttpsProxies.php +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/TargetHttpsProxies.php @@ -25,6 +25,59 @@ */ class Google_Service_Compute_Resource_TargetHttpsProxies extends Google_Service_Resource { + /** + * Retrieves the list of all TargetHttpsProxy resources, regional and global, + * available to the specified project. (targetHttpsProxies.aggregatedList) + * + * @param string $project Name of the project scoping this request. + * @param array $optParams Optional parameters. + * + * @opt_param string filter A filter expression that filters resources listed in + * the response. The expression must specify the field name, a comparison + * operator, and the value that you want to use for filtering. The value must be + * a string, a number, or a boolean. The comparison operator must be either =, + * !=, >, or <. + * + * For example, if you are filtering Compute Engine instances, you can exclude + * instances named example-instance by specifying name != example-instance. + * + * You can also filter nested fields. For example, you could specify + * scheduling.automaticRestart = false to include instances only if they are not + * scheduled for automatic restarts. You can use filtering on nested fields to + * filter based on resource labels. + * + * To filter on multiple expressions, provide each separate expression within + * parentheses. For example, (scheduling.automaticRestart = true) (cpuPlatform = + * "Intel Skylake"). By default, each expression is an AND expression. However, + * you can include AND and OR expressions explicitly. For example, (cpuPlatform + * = "Intel Skylake") OR (cpuPlatform = "Intel Broadwell") AND + * (scheduling.automaticRestart = true). + * @opt_param string maxResults The maximum number of results per page that + * should be returned. If the number of available results is larger than + * maxResults, Compute Engine returns a nextPageToken that can be used to get + * the next page of results in subsequent list requests. Acceptable values are 0 + * to 500, inclusive. (Default: 500) + * @opt_param string orderBy Sorts list results by a certain order. By default, + * results are returned in alphanumerical order based on the resource name. + * + * You can also sort results in descending order based on the creation timestamp + * using orderBy="creationTimestamp desc". This sorts results based on the + * creationTimestamp field in reverse chronological order (newest result first). + * Use this to sort resources like operations so that the newest operation is + * returned first. + * + * Currently, only sorting by name or creationTimestamp desc is supported. + * @opt_param string pageToken Specifies a page token to use. Set pageToken to + * the nextPageToken returned by a previous list request to get the next page of + * results. + * @return Google_Service_Compute_TargetHttpsProxyAggregatedList + */ + public function aggregatedList($project, $optParams = array()) + { + $params = array('project' => $project); + $params = array_merge($params, $optParams); + return $this->call('aggregatedList', array($params), "Google_Service_Compute_TargetHttpsProxyAggregatedList"); + } /** * Deletes the specified TargetHttpsProxy resource. (targetHttpsProxies.delete) * diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/UrlMaps.php b/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/UrlMaps.php index e62b5d3..35d53c4 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/UrlMaps.php +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/UrlMaps.php @@ -25,6 +25,59 @@ */ class Google_Service_Compute_Resource_UrlMaps extends Google_Service_Resource { + /** + * Retrieves the list of all UrlMap resources, regional and global, available to + * the specified project. (urlMaps.aggregatedList) + * + * @param string $project Name of the project scoping this request. + * @param array $optParams Optional parameters. + * + * @opt_param string filter A filter expression that filters resources listed in + * the response. The expression must specify the field name, a comparison + * operator, and the value that you want to use for filtering. The value must be + * a string, a number, or a boolean. The comparison operator must be either =, + * !=, >, or <. + * + * For example, if you are filtering Compute Engine instances, you can exclude + * instances named example-instance by specifying name != example-instance. + * + * You can also filter nested fields. For example, you could specify + * scheduling.automaticRestart = false to include instances only if they are not + * scheduled for automatic restarts. You can use filtering on nested fields to + * filter based on resource labels. + * + * To filter on multiple expressions, provide each separate expression within + * parentheses. For example, (scheduling.automaticRestart = true) (cpuPlatform = + * "Intel Skylake"). By default, each expression is an AND expression. However, + * you can include AND and OR expressions explicitly. For example, (cpuPlatform + * = "Intel Skylake") OR (cpuPlatform = "Intel Broadwell") AND + * (scheduling.automaticRestart = true). + * @opt_param string maxResults The maximum number of results per page that + * should be returned. If the number of available results is larger than + * maxResults, Compute Engine returns a nextPageToken that can be used to get + * the next page of results in subsequent list requests. Acceptable values are 0 + * to 500, inclusive. (Default: 500) + * @opt_param string orderBy Sorts list results by a certain order. By default, + * results are returned in alphanumerical order based on the resource name. + * + * You can also sort results in descending order based on the creation timestamp + * using orderBy="creationTimestamp desc". This sorts results based on the + * creationTimestamp field in reverse chronological order (newest result first). + * Use this to sort resources like operations so that the newest operation is + * returned first. + * + * Currently, only sorting by name or creationTimestamp desc is supported. + * @opt_param string pageToken Specifies a page token to use. Set pageToken to + * the nextPageToken returned by a previous list request to get the next page of + * results. + * @return Google_Service_Compute_UrlMapsAggregatedList + */ + public function aggregatedList($project, $optParams = array()) + { + $params = array('project' => $project); + $params = array_merge($params, $optParams); + return $this->call('aggregatedList', array($params), "Google_Service_Compute_UrlMapsAggregatedList"); + } /** * Deletes the specified UrlMap resource. (urlMaps.delete) * diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/VpnGateways.php b/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/VpnGateways.php new file mode 100644 index 0000000..b710b71 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/Resource/VpnGateways.php @@ -0,0 +1,269 @@ + + * $computeService = new Google_Service_Compute(...); + * $vpnGateways = $computeService->vpnGateways; + * + */ +class Google_Service_Compute_Resource_VpnGateways extends Google_Service_Resource +{ + /** + * Retrieves an aggregated list of VPN gateways. (vpnGateways.aggregatedList) + * + * @param string $project Project ID for this request. + * @param array $optParams Optional parameters. + * + * @opt_param string filter A filter expression that filters resources listed in + * the response. The expression must specify the field name, a comparison + * operator, and the value that you want to use for filtering. The value must be + * a string, a number, or a boolean. The comparison operator must be either =, + * !=, >, or <. + * + * For example, if you are filtering Compute Engine instances, you can exclude + * instances named example-instance by specifying name != example-instance. + * + * You can also filter nested fields. For example, you could specify + * scheduling.automaticRestart = false to include instances only if they are not + * scheduled for automatic restarts. You can use filtering on nested fields to + * filter based on resource labels. + * + * To filter on multiple expressions, provide each separate expression within + * parentheses. For example, (scheduling.automaticRestart = true) (cpuPlatform = + * "Intel Skylake"). By default, each expression is an AND expression. However, + * you can include AND and OR expressions explicitly. For example, (cpuPlatform + * = "Intel Skylake") OR (cpuPlatform = "Intel Broadwell") AND + * (scheduling.automaticRestart = true). + * @opt_param string maxResults The maximum number of results per page that + * should be returned. If the number of available results is larger than + * maxResults, Compute Engine returns a nextPageToken that can be used to get + * the next page of results in subsequent list requests. Acceptable values are 0 + * to 500, inclusive. (Default: 500) + * @opt_param string orderBy Sorts list results by a certain order. By default, + * results are returned in alphanumerical order based on the resource name. + * + * You can also sort results in descending order based on the creation timestamp + * using orderBy="creationTimestamp desc". This sorts results based on the + * creationTimestamp field in reverse chronological order (newest result first). + * Use this to sort resources like operations so that the newest operation is + * returned first. + * + * Currently, only sorting by name or creationTimestamp desc is supported. + * @opt_param string pageToken Specifies a page token to use. Set pageToken to + * the nextPageToken returned by a previous list request to get the next page of + * results. + * @return Google_Service_Compute_VpnGatewayAggregatedList + */ + public function aggregatedList($project, $optParams = array()) + { + $params = array('project' => $project); + $params = array_merge($params, $optParams); + return $this->call('aggregatedList', array($params), "Google_Service_Compute_VpnGatewayAggregatedList"); + } + /** + * Deletes the specified VPN gateway. (vpnGateways.delete) + * + * @param string $project Project ID for this request. + * @param string $region Name of the region for this request. + * @param string $vpnGateway Name of the VPN gateway to delete. + * @param array $optParams Optional parameters. + * + * @opt_param string requestId An optional request ID to identify requests. + * Specify a unique request ID so that if you must retry your request, the + * server will know to ignore the request if it has already been completed. + * + * For example, consider a situation where you make an initial request and the + * request times out. If you make the request again with the same request ID, + * the server can check if original operation with the same request ID was + * received, and if so, will ignore the second request. This prevents clients + * from accidentally creating duplicate commitments. + * + * The request ID must be a valid UUID with the exception that zero UUID is not + * supported (00000000-0000-0000-0000-000000000000). + * @return Google_Service_Compute_Operation + */ + public function delete($project, $region, $vpnGateway, $optParams = array()) + { + $params = array('project' => $project, 'region' => $region, 'vpnGateway' => $vpnGateway); + $params = array_merge($params, $optParams); + return $this->call('delete', array($params), "Google_Service_Compute_Operation"); + } + /** + * Returns the specified VPN gateway. Gets a list of available VPN gateways by + * making a list() request. (vpnGateways.get) + * + * @param string $project Project ID for this request. + * @param string $region Name of the region for this request. + * @param string $vpnGateway Name of the VPN gateway to return. + * @param array $optParams Optional parameters. + * @return Google_Service_Compute_VpnGateway + */ + public function get($project, $region, $vpnGateway, $optParams = array()) + { + $params = array('project' => $project, 'region' => $region, 'vpnGateway' => $vpnGateway); + $params = array_merge($params, $optParams); + return $this->call('get', array($params), "Google_Service_Compute_VpnGateway"); + } + /** + * Returns the status for the specified VPN gateway. (vpnGateways.getStatus) + * + * @param string $project Project ID for this request. + * @param string $region Name of the region for this request. + * @param string $vpnGateway Name of the VPN gateway to return. + * @param array $optParams Optional parameters. + * @return Google_Service_Compute_VpnGatewaysGetStatusResponse + */ + public function getStatus($project, $region, $vpnGateway, $optParams = array()) + { + $params = array('project' => $project, 'region' => $region, 'vpnGateway' => $vpnGateway); + $params = array_merge($params, $optParams); + return $this->call('getStatus', array($params), "Google_Service_Compute_VpnGatewaysGetStatusResponse"); + } + /** + * Creates a VPN gateway in the specified project and region using the data + * included in the request. (vpnGateways.insert) + * + * @param string $project Project ID for this request. + * @param string $region Name of the region for this request. + * @param Google_Service_Compute_VpnGateway $postBody + * @param array $optParams Optional parameters. + * + * @opt_param string requestId An optional request ID to identify requests. + * Specify a unique request ID so that if you must retry your request, the + * server will know to ignore the request if it has already been completed. + * + * For example, consider a situation where you make an initial request and the + * request times out. If you make the request again with the same request ID, + * the server can check if original operation with the same request ID was + * received, and if so, will ignore the second request. This prevents clients + * from accidentally creating duplicate commitments. + * + * The request ID must be a valid UUID with the exception that zero UUID is not + * supported (00000000-0000-0000-0000-000000000000). + * @return Google_Service_Compute_Operation + */ + public function insert($project, $region, Google_Service_Compute_VpnGateway $postBody, $optParams = array()) + { + $params = array('project' => $project, 'region' => $region, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('insert', array($params), "Google_Service_Compute_Operation"); + } + /** + * Retrieves a list of VPN gateways available to the specified project and + * region. (vpnGateways.listVpnGateways) + * + * @param string $project Project ID for this request. + * @param string $region Name of the region for this request. + * @param array $optParams Optional parameters. + * + * @opt_param string filter A filter expression that filters resources listed in + * the response. The expression must specify the field name, a comparison + * operator, and the value that you want to use for filtering. The value must be + * a string, a number, or a boolean. The comparison operator must be either =, + * !=, >, or <. + * + * For example, if you are filtering Compute Engine instances, you can exclude + * instances named example-instance by specifying name != example-instance. + * + * You can also filter nested fields. For example, you could specify + * scheduling.automaticRestart = false to include instances only if they are not + * scheduled for automatic restarts. You can use filtering on nested fields to + * filter based on resource labels. + * + * To filter on multiple expressions, provide each separate expression within + * parentheses. For example, (scheduling.automaticRestart = true) (cpuPlatform = + * "Intel Skylake"). By default, each expression is an AND expression. However, + * you can include AND and OR expressions explicitly. For example, (cpuPlatform + * = "Intel Skylake") OR (cpuPlatform = "Intel Broadwell") AND + * (scheduling.automaticRestart = true). + * @opt_param string maxResults The maximum number of results per page that + * should be returned. If the number of available results is larger than + * maxResults, Compute Engine returns a nextPageToken that can be used to get + * the next page of results in subsequent list requests. Acceptable values are 0 + * to 500, inclusive. (Default: 500) + * @opt_param string orderBy Sorts list results by a certain order. By default, + * results are returned in alphanumerical order based on the resource name. + * + * You can also sort results in descending order based on the creation timestamp + * using orderBy="creationTimestamp desc". This sorts results based on the + * creationTimestamp field in reverse chronological order (newest result first). + * Use this to sort resources like operations so that the newest operation is + * returned first. + * + * Currently, only sorting by name or creationTimestamp desc is supported. + * @opt_param string pageToken Specifies a page token to use. Set pageToken to + * the nextPageToken returned by a previous list request to get the next page of + * results. + * @return Google_Service_Compute_VpnGatewayList + */ + public function listVpnGateways($project, $region, $optParams = array()) + { + $params = array('project' => $project, 'region' => $region); + $params = array_merge($params, $optParams); + return $this->call('list', array($params), "Google_Service_Compute_VpnGatewayList"); + } + /** + * Sets the labels on a VpnGateway. To learn more about labels, read the + * Labeling Resources documentation. (vpnGateways.setLabels) + * + * @param string $project Project ID for this request. + * @param string $region The region for this request. + * @param string $resource Name or id of the resource for this request. + * @param Google_Service_Compute_RegionSetLabelsRequest $postBody + * @param array $optParams Optional parameters. + * + * @opt_param string requestId An optional request ID to identify requests. + * Specify a unique request ID so that if you must retry your request, the + * server will know to ignore the request if it has already been completed. + * + * For example, consider a situation where you make an initial request and the + * request times out. If you make the request again with the same request ID, + * the server can check if original operation with the same request ID was + * received, and if so, will ignore the second request. This prevents clients + * from accidentally creating duplicate commitments. + * + * The request ID must be a valid UUID with the exception that zero UUID is not + * supported (00000000-0000-0000-0000-000000000000). + * @return Google_Service_Compute_Operation + */ + public function setLabels($project, $region, $resource, Google_Service_Compute_RegionSetLabelsRequest $postBody, $optParams = array()) + { + $params = array('project' => $project, 'region' => $region, 'resource' => $resource, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('setLabels', array($params), "Google_Service_Compute_Operation"); + } + /** + * Returns permissions that a caller has on the specified resource. + * (vpnGateways.testIamPermissions) + * + * @param string $project Project ID for this request. + * @param string $region The name of the region for this request. + * @param string $resource Name or id of the resource for this request. + * @param Google_Service_Compute_TestPermissionsRequest $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_Compute_TestPermissionsResponse + */ + public function testIamPermissions($project, $region, $resource, Google_Service_Compute_TestPermissionsRequest $postBody, $optParams = array()) + { + $params = array('project' => $project, 'region' => $region, 'resource' => $resource, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('testIamPermissions', array($params), "Google_Service_Compute_TestPermissionsResponse"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/SslCertificate.php b/vendor/google/apiclient-services/src/Google/Service/Compute/SslCertificate.php index bb037fa..2fffaec 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Compute/SslCertificate.php +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/SslCertificate.php @@ -24,6 +24,7 @@ class Google_Service_Compute_SslCertificate extends Google_Model public $kind; public $name; public $privateKey; + public $region; public $selfLink; public function setCertificate($certificate) @@ -82,6 +83,14 @@ class Google_Service_Compute_SslCertificate extends Google_Model { return $this->privateKey; } + public function setRegion($region) + { + $this->region = $region; + } + public function getRegion() + { + return $this->region; + } public function setSelfLink($selfLink) { $this->selfLink = $selfLink; diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/SslCertificateAggregatedList.php b/vendor/google/apiclient-services/src/Google/Service/Compute/SslCertificateAggregatedList.php new file mode 100644 index 0000000..6b32abb --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/SslCertificateAggregatedList.php @@ -0,0 +1,89 @@ +id = $id; + } + public function getId() + { + return $this->id; + } + /** + * @param Google_Service_Compute_SslCertificatesScopedList + */ + public function setItems($items) + { + $this->items = $items; + } + /** + * @return Google_Service_Compute_SslCertificatesScopedList + */ + 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; + } + public function setSelfLink($selfLink) + { + $this->selfLink = $selfLink; + } + public function getSelfLink() + { + return $this->selfLink; + } + /** + * @param Google_Service_Compute_SslCertificateAggregatedListWarning + */ + public function setWarning(Google_Service_Compute_SslCertificateAggregatedListWarning $warning) + { + $this->warning = $warning; + } + /** + * @return Google_Service_Compute_SslCertificateAggregatedListWarning + */ + public function getWarning() + { + return $this->warning; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/SslCertificateAggregatedListWarning.php b/vendor/google/apiclient-services/src/Google/Service/Compute/SslCertificateAggregatedListWarning.php new file mode 100644 index 0000000..1d9b682 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/SslCertificateAggregatedListWarning.php @@ -0,0 +1,56 @@ +code = $code; + } + public function getCode() + { + return $this->code; + } + /** + * @param Google_Service_Compute_SslCertificateAggregatedListWarningData + */ + public function setData($data) + { + $this->data = $data; + } + /** + * @return Google_Service_Compute_SslCertificateAggregatedListWarningData + */ + public function getData() + { + return $this->data; + } + public function setMessage($message) + { + $this->message = $message; + } + public function getMessage() + { + return $this->message; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/SslCertificateAggregatedListWarningData.php b/vendor/google/apiclient-services/src/Google/Service/Compute/SslCertificateAggregatedListWarningData.php new file mode 100644 index 0000000..2b0ae80 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/SslCertificateAggregatedListWarningData.php @@ -0,0 +1,39 @@ +key = $key; + } + public function getKey() + { + return $this->key; + } + public function setValue($value) + { + $this->value = $value; + } + public function getValue() + { + return $this->value; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/SslCertificatesScopedList.php b/vendor/google/apiclient-services/src/Google/Service/Compute/SslCertificatesScopedList.php new file mode 100644 index 0000000..9798ad4 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/SslCertificatesScopedList.php @@ -0,0 +1,54 @@ +sslCertificates = $sslCertificates; + } + /** + * @return Google_Service_Compute_SslCertificate + */ + public function getSslCertificates() + { + return $this->sslCertificates; + } + /** + * @param Google_Service_Compute_SslCertificatesScopedListWarning + */ + public function setWarning(Google_Service_Compute_SslCertificatesScopedListWarning $warning) + { + $this->warning = $warning; + } + /** + * @return Google_Service_Compute_SslCertificatesScopedListWarning + */ + public function getWarning() + { + return $this->warning; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/SslCertificatesScopedListWarning.php b/vendor/google/apiclient-services/src/Google/Service/Compute/SslCertificatesScopedListWarning.php new file mode 100644 index 0000000..7a691c4 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/SslCertificatesScopedListWarning.php @@ -0,0 +1,56 @@ +code = $code; + } + public function getCode() + { + return $this->code; + } + /** + * @param Google_Service_Compute_SslCertificatesScopedListWarningData + */ + public function setData($data) + { + $this->data = $data; + } + /** + * @return Google_Service_Compute_SslCertificatesScopedListWarningData + */ + public function getData() + { + return $this->data; + } + public function setMessage($message) + { + $this->message = $message; + } + public function getMessage() + { + return $this->message; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/SslCertificatesScopedListWarningData.php b/vendor/google/apiclient-services/src/Google/Service/Compute/SslCertificatesScopedListWarningData.php new file mode 100644 index 0000000..a52f70c --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/SslCertificatesScopedListWarningData.php @@ -0,0 +1,39 @@ +key = $key; + } + public function getKey() + { + return $this->key; + } + public function setValue($value) + { + $this->value = $value; + } + public function getValue() + { + return $this->value; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/Subnetwork.php b/vendor/google/apiclient-services/src/Google/Service/Compute/Subnetwork.php index 2130e60..e0c6be0 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Compute/Subnetwork.php +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/Subnetwork.php @@ -26,13 +26,18 @@ class Google_Service_Compute_Subnetwork extends Google_Collection public $id; public $ipCidrRange; public $kind; + protected $logConfigType = 'Google_Service_Compute_SubnetworkLogConfig'; + protected $logConfigDataType = ''; public $name; public $network; public $privateIpGoogleAccess; + public $purpose; public $region; + public $role; protected $secondaryIpRangesType = 'Google_Service_Compute_SubnetworkSecondaryRange'; protected $secondaryIpRangesDataType = 'array'; public $selfLink; + public $state; public function setCreationTimestamp($creationTimestamp) { @@ -98,6 +103,20 @@ class Google_Service_Compute_Subnetwork extends Google_Collection { return $this->kind; } + /** + * @param Google_Service_Compute_SubnetworkLogConfig + */ + public function setLogConfig(Google_Service_Compute_SubnetworkLogConfig $logConfig) + { + $this->logConfig = $logConfig; + } + /** + * @return Google_Service_Compute_SubnetworkLogConfig + */ + public function getLogConfig() + { + return $this->logConfig; + } public function setName($name) { $this->name = $name; @@ -122,6 +141,14 @@ class Google_Service_Compute_Subnetwork extends Google_Collection { return $this->privateIpGoogleAccess; } + public function setPurpose($purpose) + { + $this->purpose = $purpose; + } + public function getPurpose() + { + return $this->purpose; + } public function setRegion($region) { $this->region = $region; @@ -130,6 +157,14 @@ class Google_Service_Compute_Subnetwork extends Google_Collection { return $this->region; } + public function setRole($role) + { + $this->role = $role; + } + public function getRole() + { + return $this->role; + } /** * @param Google_Service_Compute_SubnetworkSecondaryRange */ @@ -152,4 +187,12 @@ class Google_Service_Compute_Subnetwork extends Google_Collection { return $this->selfLink; } + public function setState($state) + { + $this->state = $state; + } + public function getState() + { + return $this->state; + } } diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/SubnetworkLogConfig.php b/vendor/google/apiclient-services/src/Google/Service/Compute/SubnetworkLogConfig.php new file mode 100644 index 0000000..0f57e1b --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/SubnetworkLogConfig.php @@ -0,0 +1,57 @@ +aggregationInterval = $aggregationInterval; + } + public function getAggregationInterval() + { + return $this->aggregationInterval; + } + public function setEnable($enable) + { + $this->enable = $enable; + } + public function getEnable() + { + return $this->enable; + } + public function setFlowSampling($flowSampling) + { + $this->flowSampling = $flowSampling; + } + public function getFlowSampling() + { + return $this->flowSampling; + } + public function setMetadata($metadata) + { + $this->metadata = $metadata; + } + public function getMetadata() + { + return $this->metadata; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpProxiesScopedList.php b/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpProxiesScopedList.php new file mode 100644 index 0000000..aa8a517 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpProxiesScopedList.php @@ -0,0 +1,54 @@ +targetHttpProxies = $targetHttpProxies; + } + /** + * @return Google_Service_Compute_TargetHttpProxy + */ + public function getTargetHttpProxies() + { + return $this->targetHttpProxies; + } + /** + * @param Google_Service_Compute_TargetHttpProxiesScopedListWarning + */ + public function setWarning(Google_Service_Compute_TargetHttpProxiesScopedListWarning $warning) + { + $this->warning = $warning; + } + /** + * @return Google_Service_Compute_TargetHttpProxiesScopedListWarning + */ + public function getWarning() + { + return $this->warning; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpProxiesScopedListWarning.php b/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpProxiesScopedListWarning.php new file mode 100644 index 0000000..263210b --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpProxiesScopedListWarning.php @@ -0,0 +1,56 @@ +code = $code; + } + public function getCode() + { + return $this->code; + } + /** + * @param Google_Service_Compute_TargetHttpProxiesScopedListWarningData + */ + public function setData($data) + { + $this->data = $data; + } + /** + * @return Google_Service_Compute_TargetHttpProxiesScopedListWarningData + */ + public function getData() + { + return $this->data; + } + public function setMessage($message) + { + $this->message = $message; + } + public function getMessage() + { + return $this->message; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpProxiesScopedListWarningData.php b/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpProxiesScopedListWarningData.php new file mode 100644 index 0000000..6ed204c --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpProxiesScopedListWarningData.php @@ -0,0 +1,39 @@ +key = $key; + } + public function getKey() + { + return $this->key; + } + public function setValue($value) + { + $this->value = $value; + } + public function getValue() + { + return $this->value; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpProxy.php b/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpProxy.php index 3a6c008..b8abd60 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpProxy.php +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpProxy.php @@ -22,6 +22,7 @@ class Google_Service_Compute_TargetHttpProxy extends Google_Model public $id; public $kind; public $name; + public $region; public $selfLink; public $urlMap; @@ -65,6 +66,14 @@ class Google_Service_Compute_TargetHttpProxy extends Google_Model { return $this->name; } + public function setRegion($region) + { + $this->region = $region; + } + public function getRegion() + { + return $this->region; + } public function setSelfLink($selfLink) { $this->selfLink = $selfLink; diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpProxyAggregatedList.php b/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpProxyAggregatedList.php new file mode 100644 index 0000000..1960122 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpProxyAggregatedList.php @@ -0,0 +1,73 @@ +id = $id; + } + public function getId() + { + return $this->id; + } + /** + * @param Google_Service_Compute_TargetHttpProxiesScopedList + */ + public function setItems($items) + { + $this->items = $items; + } + /** + * @return Google_Service_Compute_TargetHttpProxiesScopedList + */ + 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; + } + public function setSelfLink($selfLink) + { + $this->selfLink = $selfLink; + } + public function getSelfLink() + { + return $this->selfLink; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpsProxiesScopedList.php b/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpsProxiesScopedList.php new file mode 100644 index 0000000..b049fb5 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpsProxiesScopedList.php @@ -0,0 +1,54 @@ +targetHttpsProxies = $targetHttpsProxies; + } + /** + * @return Google_Service_Compute_TargetHttpsProxy + */ + public function getTargetHttpsProxies() + { + return $this->targetHttpsProxies; + } + /** + * @param Google_Service_Compute_TargetHttpsProxiesScopedListWarning + */ + public function setWarning(Google_Service_Compute_TargetHttpsProxiesScopedListWarning $warning) + { + $this->warning = $warning; + } + /** + * @return Google_Service_Compute_TargetHttpsProxiesScopedListWarning + */ + public function getWarning() + { + return $this->warning; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpsProxiesScopedListWarning.php b/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpsProxiesScopedListWarning.php new file mode 100644 index 0000000..e9089cd --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpsProxiesScopedListWarning.php @@ -0,0 +1,56 @@ +code = $code; + } + public function getCode() + { + return $this->code; + } + /** + * @param Google_Service_Compute_TargetHttpsProxiesScopedListWarningData + */ + public function setData($data) + { + $this->data = $data; + } + /** + * @return Google_Service_Compute_TargetHttpsProxiesScopedListWarningData + */ + public function getData() + { + return $this->data; + } + public function setMessage($message) + { + $this->message = $message; + } + public function getMessage() + { + return $this->message; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpsProxiesScopedListWarningData.php b/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpsProxiesScopedListWarningData.php new file mode 100644 index 0000000..a2e91d0 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpsProxiesScopedListWarningData.php @@ -0,0 +1,39 @@ +key = $key; + } + public function getKey() + { + return $this->key; + } + public function setValue($value) + { + $this->value = $value; + } + public function getValue() + { + return $this->value; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpsProxy.php b/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpsProxy.php index 8729402..5dabd3d 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpsProxy.php +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpsProxy.php @@ -24,6 +24,7 @@ class Google_Service_Compute_TargetHttpsProxy extends Google_Collection public $kind; public $name; public $quicOverride; + public $region; public $selfLink; public $sslCertificates; public $sslPolicy; @@ -77,6 +78,14 @@ class Google_Service_Compute_TargetHttpsProxy extends Google_Collection { return $this->quicOverride; } + public function setRegion($region) + { + $this->region = $region; + } + public function getRegion() + { + return $this->region; + } public function setSelfLink($selfLink) { $this->selfLink = $selfLink; diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpsProxyAggregatedList.php b/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpsProxyAggregatedList.php new file mode 100644 index 0000000..7b87a6a --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpsProxyAggregatedList.php @@ -0,0 +1,89 @@ +id = $id; + } + public function getId() + { + return $this->id; + } + /** + * @param Google_Service_Compute_TargetHttpsProxiesScopedList + */ + public function setItems($items) + { + $this->items = $items; + } + /** + * @return Google_Service_Compute_TargetHttpsProxiesScopedList + */ + 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; + } + public function setSelfLink($selfLink) + { + $this->selfLink = $selfLink; + } + public function getSelfLink() + { + return $this->selfLink; + } + /** + * @param Google_Service_Compute_TargetHttpsProxyAggregatedListWarning + */ + public function setWarning(Google_Service_Compute_TargetHttpsProxyAggregatedListWarning $warning) + { + $this->warning = $warning; + } + /** + * @return Google_Service_Compute_TargetHttpsProxyAggregatedListWarning + */ + public function getWarning() + { + return $this->warning; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpsProxyAggregatedListWarning.php b/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpsProxyAggregatedListWarning.php new file mode 100644 index 0000000..b57520d --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpsProxyAggregatedListWarning.php @@ -0,0 +1,56 @@ +code = $code; + } + public function getCode() + { + return $this->code; + } + /** + * @param Google_Service_Compute_TargetHttpsProxyAggregatedListWarningData + */ + public function setData($data) + { + $this->data = $data; + } + /** + * @return Google_Service_Compute_TargetHttpsProxyAggregatedListWarningData + */ + public function getData() + { + return $this->data; + } + public function setMessage($message) + { + $this->message = $message; + } + public function getMessage() + { + return $this->message; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpsProxyAggregatedListWarningData.php b/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpsProxyAggregatedListWarningData.php new file mode 100644 index 0000000..2fbd310 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/TargetHttpsProxyAggregatedListWarningData.php @@ -0,0 +1,39 @@ +key = $key; + } + public function getKey() + { + return $this->key; + } + public function setValue($value) + { + $this->value = $value; + } + public function getValue() + { + return $this->value; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/UrlMap.php b/vendor/google/apiclient-services/src/Google/Service/Compute/UrlMap.php index 0ee0771..b0803d6 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Compute/UrlMap.php +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/UrlMap.php @@ -19,9 +19,15 @@ class Google_Service_Compute_UrlMap extends Google_Collection { protected $collection_key = 'tests'; public $creationTimestamp; + protected $defaultRouteActionType = 'Google_Service_Compute_HttpRouteAction'; + protected $defaultRouteActionDataType = ''; public $defaultService; + protected $defaultUrlRedirectType = 'Google_Service_Compute_HttpRedirectAction'; + protected $defaultUrlRedirectDataType = ''; public $description; public $fingerprint; + protected $headerActionType = 'Google_Service_Compute_HttpHeaderAction'; + protected $headerActionDataType = ''; protected $hostRulesType = 'Google_Service_Compute_HostRule'; protected $hostRulesDataType = 'array'; public $id; @@ -29,6 +35,7 @@ class Google_Service_Compute_UrlMap extends Google_Collection public $name; protected $pathMatchersType = 'Google_Service_Compute_PathMatcher'; protected $pathMatchersDataType = 'array'; + public $region; public $selfLink; protected $testsType = 'Google_Service_Compute_UrlMapTest'; protected $testsDataType = 'array'; @@ -41,6 +48,20 @@ class Google_Service_Compute_UrlMap extends Google_Collection { return $this->creationTimestamp; } + /** + * @param Google_Service_Compute_HttpRouteAction + */ + public function setDefaultRouteAction(Google_Service_Compute_HttpRouteAction $defaultRouteAction) + { + $this->defaultRouteAction = $defaultRouteAction; + } + /** + * @return Google_Service_Compute_HttpRouteAction + */ + public function getDefaultRouteAction() + { + return $this->defaultRouteAction; + } public function setDefaultService($defaultService) { $this->defaultService = $defaultService; @@ -49,6 +70,20 @@ class Google_Service_Compute_UrlMap extends Google_Collection { return $this->defaultService; } + /** + * @param Google_Service_Compute_HttpRedirectAction + */ + public function setDefaultUrlRedirect(Google_Service_Compute_HttpRedirectAction $defaultUrlRedirect) + { + $this->defaultUrlRedirect = $defaultUrlRedirect; + } + /** + * @return Google_Service_Compute_HttpRedirectAction + */ + public function getDefaultUrlRedirect() + { + return $this->defaultUrlRedirect; + } public function setDescription($description) { $this->description = $description; @@ -65,6 +100,20 @@ class Google_Service_Compute_UrlMap extends Google_Collection { return $this->fingerprint; } + /** + * @param Google_Service_Compute_HttpHeaderAction + */ + public function setHeaderAction(Google_Service_Compute_HttpHeaderAction $headerAction) + { + $this->headerAction = $headerAction; + } + /** + * @return Google_Service_Compute_HttpHeaderAction + */ + public function getHeaderAction() + { + return $this->headerAction; + } /** * @param Google_Service_Compute_HostRule */ @@ -117,6 +166,14 @@ class Google_Service_Compute_UrlMap extends Google_Collection { return $this->pathMatchers; } + public function setRegion($region) + { + $this->region = $region; + } + public function getRegion() + { + return $this->region; + } public function setSelfLink($selfLink) { $this->selfLink = $selfLink; diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/UrlMapsAggregatedList.php b/vendor/google/apiclient-services/src/Google/Service/Compute/UrlMapsAggregatedList.php new file mode 100644 index 0000000..21ebeb5 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/UrlMapsAggregatedList.php @@ -0,0 +1,89 @@ +id = $id; + } + public function getId() + { + return $this->id; + } + /** + * @param Google_Service_Compute_UrlMapsScopedList + */ + public function setItems($items) + { + $this->items = $items; + } + /** + * @return Google_Service_Compute_UrlMapsScopedList + */ + 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; + } + public function setSelfLink($selfLink) + { + $this->selfLink = $selfLink; + } + public function getSelfLink() + { + return $this->selfLink; + } + /** + * @param Google_Service_Compute_UrlMapsAggregatedListWarning + */ + public function setWarning(Google_Service_Compute_UrlMapsAggregatedListWarning $warning) + { + $this->warning = $warning; + } + /** + * @return Google_Service_Compute_UrlMapsAggregatedListWarning + */ + public function getWarning() + { + return $this->warning; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/UrlMapsAggregatedListWarning.php b/vendor/google/apiclient-services/src/Google/Service/Compute/UrlMapsAggregatedListWarning.php new file mode 100644 index 0000000..eb3ff08 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/UrlMapsAggregatedListWarning.php @@ -0,0 +1,56 @@ +code = $code; + } + public function getCode() + { + return $this->code; + } + /** + * @param Google_Service_Compute_UrlMapsAggregatedListWarningData + */ + public function setData($data) + { + $this->data = $data; + } + /** + * @return Google_Service_Compute_UrlMapsAggregatedListWarningData + */ + public function getData() + { + return $this->data; + } + public function setMessage($message) + { + $this->message = $message; + } + public function getMessage() + { + return $this->message; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/UrlMapsAggregatedListWarningData.php b/vendor/google/apiclient-services/src/Google/Service/Compute/UrlMapsAggregatedListWarningData.php new file mode 100644 index 0000000..3c5ce79 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/UrlMapsAggregatedListWarningData.php @@ -0,0 +1,39 @@ +key = $key; + } + public function getKey() + { + return $this->key; + } + public function setValue($value) + { + $this->value = $value; + } + public function getValue() + { + return $this->value; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/UrlMapsScopedList.php b/vendor/google/apiclient-services/src/Google/Service/Compute/UrlMapsScopedList.php new file mode 100644 index 0000000..3a02765 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/UrlMapsScopedList.php @@ -0,0 +1,54 @@ +urlMaps = $urlMaps; + } + /** + * @return Google_Service_Compute_UrlMap + */ + public function getUrlMaps() + { + return $this->urlMaps; + } + /** + * @param Google_Service_Compute_UrlMapsScopedListWarning + */ + public function setWarning(Google_Service_Compute_UrlMapsScopedListWarning $warning) + { + $this->warning = $warning; + } + /** + * @return Google_Service_Compute_UrlMapsScopedListWarning + */ + public function getWarning() + { + return $this->warning; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/UrlMapsScopedListWarning.php b/vendor/google/apiclient-services/src/Google/Service/Compute/UrlMapsScopedListWarning.php new file mode 100644 index 0000000..50f8f8d --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/UrlMapsScopedListWarning.php @@ -0,0 +1,56 @@ +code = $code; + } + public function getCode() + { + return $this->code; + } + /** + * @param Google_Service_Compute_UrlMapsScopedListWarningData + */ + public function setData($data) + { + $this->data = $data; + } + /** + * @return Google_Service_Compute_UrlMapsScopedListWarningData + */ + public function getData() + { + return $this->data; + } + public function setMessage($message) + { + $this->message = $message; + } + public function getMessage() + { + return $this->message; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/UrlMapsScopedListWarningData.php b/vendor/google/apiclient-services/src/Google/Service/Compute/UrlMapsScopedListWarningData.php new file mode 100644 index 0000000..b7ff18e --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/UrlMapsScopedListWarningData.php @@ -0,0 +1,39 @@ +key = $key; + } + public function getKey() + { + return $this->key; + } + public function setValue($value) + { + $this->value = $value; + } + public function getValue() + { + return $this->value; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/UrlRewrite.php b/vendor/google/apiclient-services/src/Google/Service/Compute/UrlRewrite.php new file mode 100644 index 0000000..5bdbd48 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/UrlRewrite.php @@ -0,0 +1,39 @@ +hostRewrite = $hostRewrite; + } + public function getHostRewrite() + { + return $this->hostRewrite; + } + public function setPathPrefixRewrite($pathPrefixRewrite) + { + $this->pathPrefixRewrite = $pathPrefixRewrite; + } + public function getPathPrefixRewrite() + { + return $this->pathPrefixRewrite; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGateway.php b/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGateway.php new file mode 100644 index 0000000..25048f3 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGateway.php @@ -0,0 +1,128 @@ +creationTimestamp = $creationTimestamp; + } + public function getCreationTimestamp() + { + return $this->creationTimestamp; + } + public function setDescription($description) + { + $this->description = $description; + } + public function getDescription() + { + return $this->description; + } + 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 setLabelFingerprint($labelFingerprint) + { + $this->labelFingerprint = $labelFingerprint; + } + public function getLabelFingerprint() + { + return $this->labelFingerprint; + } + 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 setNetwork($network) + { + $this->network = $network; + } + public function getNetwork() + { + return $this->network; + } + public function setRegion($region) + { + $this->region = $region; + } + public function getRegion() + { + return $this->region; + } + public function setSelfLink($selfLink) + { + $this->selfLink = $selfLink; + } + public function getSelfLink() + { + return $this->selfLink; + } + /** + * @param Google_Service_Compute_VpnGatewayVpnGatewayInterface + */ + public function setVpnInterfaces($vpnInterfaces) + { + $this->vpnInterfaces = $vpnInterfaces; + } + /** + * @return Google_Service_Compute_VpnGatewayVpnGatewayInterface + */ + public function getVpnInterfaces() + { + return $this->vpnInterfaces; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewayAggregatedList.php b/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewayAggregatedList.php new file mode 100644 index 0000000..f2046f8 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewayAggregatedList.php @@ -0,0 +1,89 @@ +id = $id; + } + public function getId() + { + return $this->id; + } + /** + * @param Google_Service_Compute_VpnGatewaysScopedList + */ + public function setItems($items) + { + $this->items = $items; + } + /** + * @return Google_Service_Compute_VpnGatewaysScopedList + */ + 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; + } + public function setSelfLink($selfLink) + { + $this->selfLink = $selfLink; + } + public function getSelfLink() + { + return $this->selfLink; + } + /** + * @param Google_Service_Compute_VpnGatewayAggregatedListWarning + */ + public function setWarning(Google_Service_Compute_VpnGatewayAggregatedListWarning $warning) + { + $this->warning = $warning; + } + /** + * @return Google_Service_Compute_VpnGatewayAggregatedListWarning + */ + public function getWarning() + { + return $this->warning; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewayAggregatedListWarning.php b/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewayAggregatedListWarning.php new file mode 100644 index 0000000..db6208a --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewayAggregatedListWarning.php @@ -0,0 +1,56 @@ +code = $code; + } + public function getCode() + { + return $this->code; + } + /** + * @param Google_Service_Compute_VpnGatewayAggregatedListWarningData + */ + public function setData($data) + { + $this->data = $data; + } + /** + * @return Google_Service_Compute_VpnGatewayAggregatedListWarningData + */ + public function getData() + { + return $this->data; + } + public function setMessage($message) + { + $this->message = $message; + } + public function getMessage() + { + return $this->message; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewayAggregatedListWarningData.php b/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewayAggregatedListWarningData.php new file mode 100644 index 0000000..fd9b91a --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewayAggregatedListWarningData.php @@ -0,0 +1,39 @@ +key = $key; + } + public function getKey() + { + return $this->key; + } + public function setValue($value) + { + $this->value = $value; + } + public function getValue() + { + return $this->value; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewayList.php b/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewayList.php new file mode 100644 index 0000000..fbad469 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewayList.php @@ -0,0 +1,90 @@ +id = $id; + } + public function getId() + { + return $this->id; + } + /** + * @param Google_Service_Compute_VpnGateway + */ + public function setItems($items) + { + $this->items = $items; + } + /** + * @return Google_Service_Compute_VpnGateway + */ + 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; + } + public function setSelfLink($selfLink) + { + $this->selfLink = $selfLink; + } + public function getSelfLink() + { + return $this->selfLink; + } + /** + * @param Google_Service_Compute_VpnGatewayListWarning + */ + public function setWarning(Google_Service_Compute_VpnGatewayListWarning $warning) + { + $this->warning = $warning; + } + /** + * @return Google_Service_Compute_VpnGatewayListWarning + */ + public function getWarning() + { + return $this->warning; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewayListWarning.php b/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewayListWarning.php new file mode 100644 index 0000000..0970576 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewayListWarning.php @@ -0,0 +1,56 @@ +code = $code; + } + public function getCode() + { + return $this->code; + } + /** + * @param Google_Service_Compute_VpnGatewayListWarningData + */ + public function setData($data) + { + $this->data = $data; + } + /** + * @return Google_Service_Compute_VpnGatewayListWarningData + */ + public function getData() + { + return $this->data; + } + public function setMessage($message) + { + $this->message = $message; + } + public function getMessage() + { + return $this->message; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1NormalizedVertex.php b/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewayListWarningData.php similarity index 65% rename from vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1NormalizedVertex.php rename to vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewayListWarningData.php index 9396493..d22fd76 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1NormalizedVertex.php +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewayListWarningData.php @@ -15,25 +15,25 @@ * the License. */ -class Google_Service_Vision_GoogleCloudVisionV1p5beta1NormalizedVertex extends Google_Model +class Google_Service_Compute_VpnGatewayListWarningData extends Google_Model { - public $x; - public $y; + public $key; + public $value; - public function setX($x) + public function setKey($key) { - $this->x = $x; + $this->key = $key; } - public function getX() + public function getKey() { - return $this->x; + return $this->key; } - public function setY($y) + public function setValue($value) { - $this->y = $y; + $this->value = $value; } - public function getY() + public function getValue() { - return $this->y; + return $this->value; } } diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewayStatus.php b/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewayStatus.php new file mode 100644 index 0000000..72defb3 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewayStatus.php @@ -0,0 +1,38 @@ +vpnConnections = $vpnConnections; + } + /** + * @return Google_Service_Compute_VpnGatewayStatusVpnConnection + */ + public function getVpnConnections() + { + return $this->vpnConnections; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1BatchOperationMetadata.php b/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewayStatusHighAvailabilityRequirementState.php similarity index 64% rename from vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1BatchOperationMetadata.php rename to vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewayStatusHighAvailabilityRequirementState.php index b070556..b8eeaf9 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1BatchOperationMetadata.php +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewayStatusHighAvailabilityRequirementState.php @@ -15,20 +15,11 @@ * the License. */ -class Google_Service_Vision_GoogleCloudVisionV1p5beta1BatchOperationMetadata extends Google_Model +class Google_Service_Compute_VpnGatewayStatusHighAvailabilityRequirementState extends Google_Model { - public $endTime; public $state; - public $submitTime; + public $unsatisfiedReason; - public function setEndTime($endTime) - { - $this->endTime = $endTime; - } - public function getEndTime() - { - return $this->endTime; - } public function setState($state) { $this->state = $state; @@ -37,12 +28,12 @@ class Google_Service_Vision_GoogleCloudVisionV1p5beta1BatchOperationMetadata ext { return $this->state; } - public function setSubmitTime($submitTime) + public function setUnsatisfiedReason($unsatisfiedReason) { - $this->submitTime = $submitTime; + $this->unsatisfiedReason = $unsatisfiedReason; } - public function getSubmitTime() + public function getUnsatisfiedReason() { - return $this->submitTime; + return $this->unsatisfiedReason; } } diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewayStatusTunnel.php b/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewayStatusTunnel.php new file mode 100644 index 0000000..5bbf7c4 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewayStatusTunnel.php @@ -0,0 +1,48 @@ +localGatewayInterface = $localGatewayInterface; + } + public function getLocalGatewayInterface() + { + return $this->localGatewayInterface; + } + public function setPeerGatewayInterface($peerGatewayInterface) + { + $this->peerGatewayInterface = $peerGatewayInterface; + } + public function getPeerGatewayInterface() + { + return $this->peerGatewayInterface; + } + public function setTunnelUrl($tunnelUrl) + { + $this->tunnelUrl = $tunnelUrl; + } + public function getTunnelUrl() + { + return $this->tunnelUrl; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewayStatusVpnConnection.php b/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewayStatusVpnConnection.php new file mode 100644 index 0000000..8b6ff9f --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewayStatusVpnConnection.php @@ -0,0 +1,72 @@ +peerExternalGateway = $peerExternalGateway; + } + public function getPeerExternalGateway() + { + return $this->peerExternalGateway; + } + public function setPeerGcpGateway($peerGcpGateway) + { + $this->peerGcpGateway = $peerGcpGateway; + } + public function getPeerGcpGateway() + { + return $this->peerGcpGateway; + } + /** + * @param Google_Service_Compute_VpnGatewayStatusHighAvailabilityRequirementState + */ + public function setState(Google_Service_Compute_VpnGatewayStatusHighAvailabilityRequirementState $state) + { + $this->state = $state; + } + /** + * @return Google_Service_Compute_VpnGatewayStatusHighAvailabilityRequirementState + */ + public function getState() + { + return $this->state; + } + /** + * @param Google_Service_Compute_VpnGatewayStatusTunnel + */ + public function setTunnels($tunnels) + { + $this->tunnels = $tunnels; + } + /** + * @return Google_Service_Compute_VpnGatewayStatusTunnel + */ + public function getTunnels() + { + return $this->tunnels; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewayVpnGatewayInterface.php b/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewayVpnGatewayInterface.php new file mode 100644 index 0000000..d1ebea6 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewayVpnGatewayInterface.php @@ -0,0 +1,39 @@ +id = $id; + } + public function getId() + { + return $this->id; + } + public function setIpAddress($ipAddress) + { + $this->ipAddress = $ipAddress; + } + public function getIpAddress() + { + return $this->ipAddress; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewaysGetStatusResponse.php b/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewaysGetStatusResponse.php new file mode 100644 index 0000000..11d79a9 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewaysGetStatusResponse.php @@ -0,0 +1,37 @@ +result = $result; + } + /** + * @return Google_Service_Compute_VpnGatewayStatus + */ + public function getResult() + { + return $this->result; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewaysScopedList.php b/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewaysScopedList.php new file mode 100644 index 0000000..41ea76c --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewaysScopedList.php @@ -0,0 +1,54 @@ +vpnGateways = $vpnGateways; + } + /** + * @return Google_Service_Compute_VpnGateway + */ + public function getVpnGateways() + { + return $this->vpnGateways; + } + /** + * @param Google_Service_Compute_VpnGatewaysScopedListWarning + */ + public function setWarning(Google_Service_Compute_VpnGatewaysScopedListWarning $warning) + { + $this->warning = $warning; + } + /** + * @return Google_Service_Compute_VpnGatewaysScopedListWarning + */ + public function getWarning() + { + return $this->warning; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewaysScopedListWarning.php b/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewaysScopedListWarning.php new file mode 100644 index 0000000..e775fdb --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewaysScopedListWarning.php @@ -0,0 +1,56 @@ +code = $code; + } + public function getCode() + { + return $this->code; + } + /** + * @param Google_Service_Compute_VpnGatewaysScopedListWarningData + */ + public function setData($data) + { + $this->data = $data; + } + /** + * @return Google_Service_Compute_VpnGatewaysScopedListWarningData + */ + public function getData() + { + return $this->data; + } + public function setMessage($message) + { + $this->message = $message; + } + public function getMessage() + { + return $this->message; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewaysScopedListWarningData.php b/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewaysScopedListWarningData.php new file mode 100644 index 0000000..687a8ec --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/VpnGatewaysScopedListWarningData.php @@ -0,0 +1,39 @@ +key = $key; + } + public function getKey() + { + return $this->key; + } + public function setValue($value) + { + $this->value = $value; + } + public function getValue() + { + return $this->value; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/VpnTunnel.php b/vendor/google/apiclient-services/src/Google/Service/Compute/VpnTunnel.php index bf3233c..aa738f5 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Compute/VpnTunnel.php +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/VpnTunnel.php @@ -26,6 +26,9 @@ class Google_Service_Compute_VpnTunnel extends Google_Collection public $kind; public $localTrafficSelector; public $name; + public $peerExternalGateway; + public $peerExternalGatewayInterface; + public $peerGcpGateway; public $peerIp; public $region; public $remoteTrafficSelector; @@ -35,6 +38,8 @@ class Google_Service_Compute_VpnTunnel extends Google_Collection public $sharedSecretHash; public $status; public $targetVpnGateway; + public $vpnGateway; + public $vpnGatewayInterface; public function setCreationTimestamp($creationTimestamp) { @@ -100,6 +105,30 @@ class Google_Service_Compute_VpnTunnel extends Google_Collection { return $this->name; } + public function setPeerExternalGateway($peerExternalGateway) + { + $this->peerExternalGateway = $peerExternalGateway; + } + public function getPeerExternalGateway() + { + return $this->peerExternalGateway; + } + public function setPeerExternalGatewayInterface($peerExternalGatewayInterface) + { + $this->peerExternalGatewayInterface = $peerExternalGatewayInterface; + } + public function getPeerExternalGatewayInterface() + { + return $this->peerExternalGatewayInterface; + } + public function setPeerGcpGateway($peerGcpGateway) + { + $this->peerGcpGateway = $peerGcpGateway; + } + public function getPeerGcpGateway() + { + return $this->peerGcpGateway; + } public function setPeerIp($peerIp) { $this->peerIp = $peerIp; @@ -172,4 +201,20 @@ class Google_Service_Compute_VpnTunnel extends Google_Collection { return $this->targetVpnGateway; } + public function setVpnGateway($vpnGateway) + { + $this->vpnGateway = $vpnGateway; + } + public function getVpnGateway() + { + return $this->vpnGateway; + } + public function setVpnGatewayInterface($vpnGatewayInterface) + { + $this->vpnGatewayInterface = $vpnGatewayInterface; + } + public function getVpnGatewayInterface() + { + return $this->vpnGatewayInterface; + } } diff --git a/vendor/google/apiclient-services/src/Google/Service/Compute/WeightedBackendService.php b/vendor/google/apiclient-services/src/Google/Service/Compute/WeightedBackendService.php new file mode 100644 index 0000000..28e78c9 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Compute/WeightedBackendService.php @@ -0,0 +1,55 @@ +backendService = $backendService; + } + public function getBackendService() + { + return $this->backendService; + } + /** + * @param Google_Service_Compute_HttpHeaderAction + */ + public function setHeaderAction(Google_Service_Compute_HttpHeaderAction $headerAction) + { + $this->headerAction = $headerAction; + } + /** + * @return Google_Service_Compute_HttpHeaderAction + */ + public function getHeaderAction() + { + return $this->headerAction; + } + public function setWeight($weight) + { + $this->weight = $weight; + } + public function getWeight() + { + return $this->weight; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Container.php b/vendor/google/apiclient-services/src/Google/Service/Container.php index d9a2b24..4450765 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Container.php +++ b/vendor/google/apiclient-services/src/Google/Service/Container.php @@ -178,6 +178,10 @@ class Google_Service_Container extends Google_Service 'type' => 'string', 'required' => true, ), + 'clusterId' => array( + 'location' => 'query', + 'type' => 'string', + ), 'projectId' => array( 'location' => 'query', 'type' => 'string', @@ -186,10 +190,6 @@ class Google_Service_Container extends Google_Service 'location' => 'query', 'type' => 'string', ), - 'clusterId' => array( - 'location' => 'query', - 'type' => 'string', - ), ), ),'getJwks' => array( 'path' => 'v1/{+parent}/jwks', @@ -394,14 +394,6 @@ class Google_Service_Container extends Google_Service 'type' => 'string', 'required' => true, ), - 'projectId' => array( - 'location' => 'query', - 'type' => 'string', - ), - 'zone' => array( - 'location' => 'query', - 'type' => 'string', - ), 'clusterId' => array( 'location' => 'query', 'type' => 'string', @@ -410,6 +402,14 @@ class Google_Service_Container extends Google_Service 'location' => 'query', 'type' => 'string', ), + 'projectId' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'zone' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'list' => array( 'path' => 'v1/{+parent}/nodePools', @@ -532,10 +532,6 @@ class Google_Service_Container extends Google_Service 'type' => 'string', 'required' => true, ), - 'operationId' => array( - 'location' => 'query', - 'type' => 'string', - ), 'projectId' => array( 'location' => 'query', 'type' => 'string', @@ -544,6 +540,10 @@ class Google_Service_Container extends Google_Service 'location' => 'query', 'type' => 'string', ), + 'operationId' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'list' => array( 'path' => 'v1/{+parent}/operations', diff --git a/vendor/google/apiclient-services/src/Google/Service/Container/BinaryAuthorization.php b/vendor/google/apiclient-services/src/Google/Service/Container/BinaryAuthorization.php new file mode 100644 index 0000000..4a8c095 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Container/BinaryAuthorization.php @@ -0,0 +1,30 @@ +enabled = $enabled; + } + public function getEnabled() + { + return $this->enabled; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Container/Cluster.php b/vendor/google/apiclient-services/src/Google/Service/Container/Cluster.php index 04144f2..64c3a71 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Container/Cluster.php +++ b/vendor/google/apiclient-services/src/Google/Service/Container/Cluster.php @@ -20,6 +20,8 @@ class Google_Service_Container_Cluster extends Google_Collection protected $collection_key = 'nodePools'; protected $addonsConfigType = 'Google_Service_Container_AddonsConfig'; protected $addonsConfigDataType = ''; + protected $binaryAuthorizationType = 'Google_Service_Container_BinaryAuthorization'; + protected $binaryAuthorizationDataType = ''; public $clusterIpv4Cidr; protected $conditionsType = 'Google_Service_Container_StatusCondition'; protected $conditionsDataType = 'array'; @@ -27,6 +29,8 @@ class Google_Service_Container_Cluster extends Google_Collection public $currentMasterVersion; public $currentNodeCount; public $currentNodeVersion; + protected $databaseEncryptionType = 'Google_Service_Container_DatabaseEncryption'; + protected $databaseEncryptionDataType = ''; protected $defaultMaxPodsConstraintType = 'Google_Service_Container_MaxPodsConstraint'; protected $defaultMaxPodsConstraintDataType = ''; public $description; @@ -90,6 +94,20 @@ class Google_Service_Container_Cluster extends Google_Collection { return $this->addonsConfig; } + /** + * @param Google_Service_Container_BinaryAuthorization + */ + public function setBinaryAuthorization(Google_Service_Container_BinaryAuthorization $binaryAuthorization) + { + $this->binaryAuthorization = $binaryAuthorization; + } + /** + * @return Google_Service_Container_BinaryAuthorization + */ + public function getBinaryAuthorization() + { + return $this->binaryAuthorization; + } public function setClusterIpv4Cidr($clusterIpv4Cidr) { $this->clusterIpv4Cidr = $clusterIpv4Cidr; @@ -144,6 +162,20 @@ class Google_Service_Container_Cluster extends Google_Collection { return $this->currentNodeVersion; } + /** + * @param Google_Service_Container_DatabaseEncryption + */ + public function setDatabaseEncryption(Google_Service_Container_DatabaseEncryption $databaseEncryption) + { + $this->databaseEncryption = $databaseEncryption; + } + /** + * @return Google_Service_Container_DatabaseEncryption + */ + public function getDatabaseEncryption() + { + return $this->databaseEncryption; + } /** * @param Google_Service_Container_MaxPodsConstraint */ diff --git a/vendor/google/apiclient-services/src/Google/Service/Container/ClusterUpdate.php b/vendor/google/apiclient-services/src/Google/Service/Container/ClusterUpdate.php index 89a9be4..924c9a7 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Container/ClusterUpdate.php +++ b/vendor/google/apiclient-services/src/Google/Service/Container/ClusterUpdate.php @@ -20,7 +20,13 @@ class Google_Service_Container_ClusterUpdate extends Google_Collection protected $collection_key = 'desiredLocations'; protected $desiredAddonsConfigType = 'Google_Service_Container_AddonsConfig'; protected $desiredAddonsConfigDataType = ''; + protected $desiredBinaryAuthorizationType = 'Google_Service_Container_BinaryAuthorization'; + protected $desiredBinaryAuthorizationDataType = ''; + protected $desiredDatabaseEncryptionType = 'Google_Service_Container_DatabaseEncryption'; + protected $desiredDatabaseEncryptionDataType = ''; public $desiredImageType; + protected $desiredIntraNodeVisibilityConfigType = 'Google_Service_Container_IntraNodeVisibilityConfig'; + protected $desiredIntraNodeVisibilityConfigDataType = ''; public $desiredLocations; public $desiredLoggingService; protected $desiredMasterAuthorizedNetworksConfigType = 'Google_Service_Container_MasterAuthorizedNetworksConfig'; @@ -48,6 +54,34 @@ class Google_Service_Container_ClusterUpdate extends Google_Collection { return $this->desiredAddonsConfig; } + /** + * @param Google_Service_Container_BinaryAuthorization + */ + public function setDesiredBinaryAuthorization(Google_Service_Container_BinaryAuthorization $desiredBinaryAuthorization) + { + $this->desiredBinaryAuthorization = $desiredBinaryAuthorization; + } + /** + * @return Google_Service_Container_BinaryAuthorization + */ + public function getDesiredBinaryAuthorization() + { + return $this->desiredBinaryAuthorization; + } + /** + * @param Google_Service_Container_DatabaseEncryption + */ + public function setDesiredDatabaseEncryption(Google_Service_Container_DatabaseEncryption $desiredDatabaseEncryption) + { + $this->desiredDatabaseEncryption = $desiredDatabaseEncryption; + } + /** + * @return Google_Service_Container_DatabaseEncryption + */ + public function getDesiredDatabaseEncryption() + { + return $this->desiredDatabaseEncryption; + } public function setDesiredImageType($desiredImageType) { $this->desiredImageType = $desiredImageType; @@ -56,6 +90,20 @@ class Google_Service_Container_ClusterUpdate extends Google_Collection { return $this->desiredImageType; } + /** + * @param Google_Service_Container_IntraNodeVisibilityConfig + */ + public function setDesiredIntraNodeVisibilityConfig(Google_Service_Container_IntraNodeVisibilityConfig $desiredIntraNodeVisibilityConfig) + { + $this->desiredIntraNodeVisibilityConfig = $desiredIntraNodeVisibilityConfig; + } + /** + * @return Google_Service_Container_IntraNodeVisibilityConfig + */ + public function getDesiredIntraNodeVisibilityConfig() + { + return $this->desiredIntraNodeVisibilityConfig; + } public function setDesiredLocations($desiredLocations) { $this->desiredLocations = $desiredLocations; diff --git a/vendor/google/apiclient-services/src/Google/Service/Container/DatabaseEncryption.php b/vendor/google/apiclient-services/src/Google/Service/Container/DatabaseEncryption.php new file mode 100644 index 0000000..d1ebc46 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Container/DatabaseEncryption.php @@ -0,0 +1,39 @@ +keyName = $keyName; + } + public function getKeyName() + { + return $this->keyName; + } + public function setState($state) + { + $this->state = $state; + } + public function getState() + { + return $this->state; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1alpha2FhirRestGcsSource.php b/vendor/google/apiclient-services/src/Google/Service/Container/IntraNodeVisibilityConfig.php similarity index 73% rename from vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1alpha2FhirRestGcsSource.php rename to vendor/google/apiclient-services/src/Google/Service/Container/IntraNodeVisibilityConfig.php index 051a192..19ed2e8 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/GoogleCloudHealthcareV1alpha2FhirRestGcsSource.php +++ b/vendor/google/apiclient-services/src/Google/Service/Container/IntraNodeVisibilityConfig.php @@ -15,16 +15,16 @@ * the License. */ -class Google_Service_CloudHealthcare_GoogleCloudHealthcareV1alpha2FhirRestGcsSource extends Google_Model +class Google_Service_Container_IntraNodeVisibilityConfig extends Google_Model { - public $uri; + public $enabled; - public function setUri($uri) + public function setEnabled($enabled) { - $this->uri = $uri; + $this->enabled = $enabled; } - public function getUri() + public function getEnabled() { - return $this->uri; + return $this->enabled; } } diff --git a/vendor/google/apiclient-services/src/Google/Service/Container/NetworkConfig.php b/vendor/google/apiclient-services/src/Google/Service/Container/NetworkConfig.php index dc2d937..2628d8b 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Container/NetworkConfig.php +++ b/vendor/google/apiclient-services/src/Google/Service/Container/NetworkConfig.php @@ -17,9 +17,18 @@ class Google_Service_Container_NetworkConfig extends Google_Model { + public $enableIntraNodeVisibility; public $network; public $subnetwork; + public function setEnableIntraNodeVisibility($enableIntraNodeVisibility) + { + $this->enableIntraNodeVisibility = $enableIntraNodeVisibility; + } + public function getEnableIntraNodeVisibility() + { + return $this->enableIntraNodeVisibility; + } public function setNetwork($network) { $this->network = $network; diff --git a/vendor/google/apiclient-services/src/Google/Service/Container/NodeConfig.php b/vendor/google/apiclient-services/src/Google/Service/Container/NodeConfig.php index 6958621..e0c3934 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Container/NodeConfig.php +++ b/vendor/google/apiclient-services/src/Google/Service/Container/NodeConfig.php @@ -31,6 +31,8 @@ class Google_Service_Container_NodeConfig extends Google_Collection public $oauthScopes; public $preemptible; public $serviceAccount; + protected $shieldedInstanceConfigType = 'Google_Service_Container_ShieldedInstanceConfig'; + protected $shieldedInstanceConfigDataType = ''; public $tags; protected $taintsType = 'Google_Service_Container_NodeTaint'; protected $taintsDataType = 'array'; @@ -137,6 +139,20 @@ class Google_Service_Container_NodeConfig extends Google_Collection { return $this->serviceAccount; } + /** + * @param Google_Service_Container_ShieldedInstanceConfig + */ + public function setShieldedInstanceConfig(Google_Service_Container_ShieldedInstanceConfig $shieldedInstanceConfig) + { + $this->shieldedInstanceConfig = $shieldedInstanceConfig; + } + /** + * @return Google_Service_Container_ShieldedInstanceConfig + */ + public function getShieldedInstanceConfig() + { + return $this->shieldedInstanceConfig; + } public function setTags($tags) { $this->tags = $tags; diff --git a/vendor/google/apiclient-services/src/Google/Service/Container/Resource/ProjectsLocationsClusters.php b/vendor/google/apiclient-services/src/Google/Service/Container/Resource/ProjectsLocationsClusters.php index 1e0360f..328e341 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Container/Resource/ProjectsLocationsClusters.php +++ b/vendor/google/apiclient-services/src/Google/Service/Container/Resource/ProjectsLocationsClusters.php @@ -105,6 +105,8 @@ class Google_Service_Container_Resource_ProjectsLocationsClusters extends Google * retrieve. Specified in the format 'projects/locations/clusters'. * @param array $optParams Optional parameters. * + * @opt_param string clusterId Deprecated. The name of the cluster to retrieve. + * This field has been deprecated and replaced by the name field. * @opt_param string projectId Deprecated. The Google Developers Console * [project ID or project * number](https://support.google.com/cloud/answer/6158840). This field has been @@ -112,8 +114,6 @@ class Google_Service_Container_Resource_ProjectsLocationsClusters extends Google * @opt_param string zone Deprecated. The name of the Google Compute Engine * [zone](/compute/docs/zones#available) in which the cluster resides. This * field has been deprecated and replaced by the name field. - * @opt_param string clusterId Deprecated. The name of the cluster to retrieve. - * This field has been deprecated and replaced by the name field. * @return Google_Service_Container_Cluster */ public function get($name, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Container/Resource/ProjectsLocationsClustersNodePools.php b/vendor/google/apiclient-services/src/Google/Service/Container/Resource/ProjectsLocationsClustersNodePools.php index 757d79e..09d0b86 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Container/Resource/ProjectsLocationsClustersNodePools.php +++ b/vendor/google/apiclient-services/src/Google/Service/Container/Resource/ProjectsLocationsClustersNodePools.php @@ -76,6 +76,10 @@ class Google_Service_Container_Resource_ProjectsLocationsClustersNodePools exten * 'projects/locations/clusters/nodePools'. * @param array $optParams Optional parameters. * + * @opt_param string clusterId Deprecated. The name of the cluster. This field + * has been deprecated and replaced by the name field. + * @opt_param string nodePoolId Deprecated. The name of the node pool. This + * field has been deprecated and replaced by the name field. * @opt_param string projectId Deprecated. The Google Developers Console * [project ID or project * number](https://developers.google.com/console/help/new/#projectnumber). This @@ -83,10 +87,6 @@ class Google_Service_Container_Resource_ProjectsLocationsClustersNodePools exten * @opt_param string zone Deprecated. The name of the Google Compute Engine * [zone](/compute/docs/zones#available) in which the cluster resides. This * field has been deprecated and replaced by the name field. - * @opt_param string clusterId Deprecated. The name of the cluster. This field - * has been deprecated and replaced by the name field. - * @opt_param string nodePoolId Deprecated. The name of the node pool. This - * field has been deprecated and replaced by the name field. * @return Google_Service_Container_NodePool */ public function get($name, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Container/Resource/ProjectsLocationsOperations.php b/vendor/google/apiclient-services/src/Google/Service/Container/Resource/ProjectsLocationsOperations.php index bbb40d5..4465022 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Container/Resource/ProjectsLocationsOperations.php +++ b/vendor/google/apiclient-services/src/Google/Service/Container/Resource/ProjectsLocationsOperations.php @@ -47,8 +47,6 @@ class Google_Service_Container_Resource_ProjectsLocationsOperations extends Goog * operation to get. Specified in the format 'projects/locations/operations'. * @param array $optParams Optional parameters. * - * @opt_param string operationId Deprecated. The server-assigned `name` of the - * operation. This field has been deprecated and replaced by the name field. * @opt_param string projectId Deprecated. The Google Developers Console * [project ID or project * number](https://support.google.com/cloud/answer/6158840). This field has been @@ -56,6 +54,8 @@ class Google_Service_Container_Resource_ProjectsLocationsOperations extends Goog * @opt_param string zone Deprecated. The name of the Google Compute Engine * [zone](/compute/docs/zones#available) in which the cluster resides. This * field has been deprecated and replaced by the name field. + * @opt_param string operationId Deprecated. The server-assigned `name` of the + * operation. This field has been deprecated and replaced by the name field. * @return Google_Service_Container_Operation */ public function get($name, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Container/ShieldedInstanceConfig.php b/vendor/google/apiclient-services/src/Google/Service/Container/ShieldedInstanceConfig.php new file mode 100644 index 0000000..263233e --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Container/ShieldedInstanceConfig.php @@ -0,0 +1,39 @@ +enableIntegrityMonitoring = $enableIntegrityMonitoring; + } + public function getEnableIntegrityMonitoring() + { + return $this->enableIntegrityMonitoring; + } + public function setEnableSecureBoot($enableSecureBoot) + { + $this->enableSecureBoot = $enableSecureBoot; + } + public function getEnableSecureBoot() + { + return $this->enableSecureBoot; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/ContainerAnalysis.php b/vendor/google/apiclient-services/src/Google/Service/ContainerAnalysis.php index e916937..4a69416 100644 --- a/vendor/google/apiclient-services/src/Google/Service/ContainerAnalysis.php +++ b/vendor/google/apiclient-services/src/Google/Service/ContainerAnalysis.php @@ -191,6 +191,10 @@ class Google_Service_ContainerAnalysis extends Google_Service 'type' => 'string', 'required' => true, ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -199,10 +203,6 @@ class Google_Service_ContainerAnalysis extends Google_Service 'location' => 'query', 'type' => 'integer', ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), ), ), ) @@ -291,14 +291,6 @@ class Google_Service_ContainerAnalysis extends Google_Service 'type' => 'string', 'required' => true, ), - 'name' => array( - 'location' => 'query', - 'type' => 'string', - ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -311,6 +303,14 @@ class Google_Service_ContainerAnalysis extends Google_Service 'location' => 'query', 'type' => 'integer', ), + 'name' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'patch' => array( 'path' => 'v1alpha1/{+name}', @@ -499,14 +499,6 @@ class Google_Service_ContainerAnalysis extends Google_Service 'type' => 'string', 'required' => true, ), - 'parent' => array( - 'location' => 'query', - 'type' => 'string', - ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -515,6 +507,14 @@ class Google_Service_ContainerAnalysis extends Google_Service 'location' => 'query', 'type' => 'integer', ), + 'parent' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'patch' => array( 'path' => 'v1alpha1/{+name}', diff --git a/vendor/google/apiclient-services/src/Google/Service/ContainerAnalysis/Discovered.php b/vendor/google/apiclient-services/src/Google/Service/ContainerAnalysis/Discovered.php index 60dbae4..37c0524 100644 --- a/vendor/google/apiclient-services/src/Google/Service/ContainerAnalysis/Discovered.php +++ b/vendor/google/apiclient-services/src/Google/Service/ContainerAnalysis/Discovered.php @@ -21,6 +21,7 @@ class Google_Service_ContainerAnalysis_Discovered extends Google_Model protected $analysisStatusErrorType = 'Google_Service_ContainerAnalysis_Status'; protected $analysisStatusErrorDataType = ''; public $continuousAnalysis; + public $cpe; protected $operationType = 'Google_Service_ContainerAnalysis_Operation'; protected $operationDataType = ''; @@ -54,6 +55,14 @@ class Google_Service_ContainerAnalysis_Discovered extends Google_Model { return $this->continuousAnalysis; } + public function setCpe($cpe) + { + $this->cpe = $cpe; + } + public function getCpe() + { + return $this->cpe; + } /** * @param Google_Service_ContainerAnalysis_Operation */ diff --git a/vendor/google/apiclient-services/src/Google/Service/ContainerAnalysis/Policy.php b/vendor/google/apiclient-services/src/Google/Service/ContainerAnalysis/Policy.php index 9110b4a..16404cd 100644 --- a/vendor/google/apiclient-services/src/Google/Service/ContainerAnalysis/Policy.php +++ b/vendor/google/apiclient-services/src/Google/Service/ContainerAnalysis/Policy.php @@ -18,27 +18,11 @@ class Google_Service_ContainerAnalysis_Policy extends Google_Collection { protected $collection_key = 'bindings'; - protected $auditConfigsType = 'Google_Service_ContainerAnalysis_AuditConfig'; - protected $auditConfigsDataType = 'array'; protected $bindingsType = 'Google_Service_ContainerAnalysis_Binding'; protected $bindingsDataType = 'array'; public $etag; public $version; - /** - * @param Google_Service_ContainerAnalysis_AuditConfig - */ - public function setAuditConfigs($auditConfigs) - { - $this->auditConfigs = $auditConfigs; - } - /** - * @return Google_Service_ContainerAnalysis_AuditConfig - */ - public function getAuditConfigs() - { - return $this->auditConfigs; - } /** * @param Google_Service_ContainerAnalysis_Binding */ diff --git a/vendor/google/apiclient-services/src/Google/Service/ContainerAnalysis/Resource/ProjectsNotesOccurrences.php b/vendor/google/apiclient-services/src/Google/Service/ContainerAnalysis/Resource/ProjectsNotesOccurrences.php index 2eb01f0..61ac7e6 100644 --- a/vendor/google/apiclient-services/src/Google/Service/ContainerAnalysis/Resource/ProjectsNotesOccurrences.php +++ b/vendor/google/apiclient-services/src/Google/Service/ContainerAnalysis/Resource/ProjectsNotesOccurrences.php @@ -34,10 +34,10 @@ class Google_Service_ContainerAnalysis_Resource_ProjectsNotesOccurrences extends * "provider/{provider_id}/notes/{note_id}" * @param array $optParams Optional parameters. * + * @opt_param string filter The filter expression. * @opt_param string pageToken Token to provide to skip to a particular spot in * the list. * @opt_param int pageSize Number of notes to return in the list. - * @opt_param string filter The filter expression. * @return Google_Service_ContainerAnalysis_ListNoteOccurrencesResponse */ public function listProjectsNotesOccurrences($name, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/ContainerAnalysis/Resource/ProjectsOccurrences.php b/vendor/google/apiclient-services/src/Google/Service/ContainerAnalysis/Resource/ProjectsOccurrences.php index 3946fc0..315d07a 100644 --- a/vendor/google/apiclient-services/src/Google/Service/ContainerAnalysis/Resource/ProjectsOccurrences.php +++ b/vendor/google/apiclient-services/src/Google/Service/ContainerAnalysis/Resource/ProjectsOccurrences.php @@ -138,13 +138,13 @@ class Google_Service_ContainerAnalysis_Resource_ProjectsOccurrences extends Goog * projects/{project_id}. * @param array $optParams Optional parameters. * - * @opt_param string name The name field contains the project Id. For example: - * "projects/{project_id} @Deprecated - * @opt_param string filter The filter expression. * @opt_param string pageToken Token to provide to skip to a particular spot in * the list. * @opt_param string kind The kind of occurrences to filter on. * @opt_param int pageSize Number of occurrences to return in the list. + * @opt_param string name The name field contains the project Id. For example: + * "projects/{project_id} @Deprecated + * @opt_param string filter The filter expression. * @return Google_Service_ContainerAnalysis_ListOccurrencesResponse */ public function listProjectsOccurrences($parent, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/ContainerAnalysis/Resource/ProvidersNotes.php b/vendor/google/apiclient-services/src/Google/Service/ContainerAnalysis/Resource/ProvidersNotes.php index 7521281..c29bd85 100644 --- a/vendor/google/apiclient-services/src/Google/Service/ContainerAnalysis/Resource/ProvidersNotes.php +++ b/vendor/google/apiclient-services/src/Google/Service/ContainerAnalysis/Resource/ProvidersNotes.php @@ -104,12 +104,12 @@ class Google_Service_ContainerAnalysis_Resource_ProvidersNotes extends Google_Se * "providers/{provider_id} @Deprecated * @param array $optParams Optional parameters. * - * @opt_param string parent This field contains the project Id for example: - * "projects/{PROJECT_ID}". - * @opt_param string filter The filter expression. * @opt_param string pageToken Token to provide to skip to a particular spot in * the list. * @opt_param int pageSize Number of notes to return in the list. + * @opt_param string parent This field contains the project Id for example: + * "projects/{PROJECT_ID}". + * @opt_param string filter The filter expression. * @return Google_Service_ContainerAnalysis_ListNotesResponse */ public function listProvidersNotes($name, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/ContainerAnalysis/SetIamPolicyRequest.php b/vendor/google/apiclient-services/src/Google/Service/ContainerAnalysis/SetIamPolicyRequest.php index 7e582e4..9852524 100644 --- a/vendor/google/apiclient-services/src/Google/Service/ContainerAnalysis/SetIamPolicyRequest.php +++ b/vendor/google/apiclient-services/src/Google/Service/ContainerAnalysis/SetIamPolicyRequest.php @@ -19,7 +19,6 @@ class Google_Service_ContainerAnalysis_SetIamPolicyRequest extends Google_Model { protected $policyType = 'Google_Service_ContainerAnalysis_Policy'; protected $policyDataType = ''; - public $updateMask; /** * @param Google_Service_ContainerAnalysis_Policy @@ -35,12 +34,4 @@ class Google_Service_ContainerAnalysis_SetIamPolicyRequest extends Google_Model { return $this->policy; } - public function setUpdateMask($updateMask) - { - $this->updateMask = $updateMask; - } - public function getUpdateMask() - { - return $this->updateMask; - } } diff --git a/vendor/google/apiclient-services/src/Google/Service/DLP.php b/vendor/google/apiclient-services/src/Google/Service/DLP.php index ae3ab0a..e4ddbb2 100644 --- a/vendor/google/apiclient-services/src/Google/Service/DLP.php +++ b/vendor/google/apiclient-services/src/Google/Service/DLP.php @@ -37,6 +37,7 @@ class Google_Service_DLP extends Google_Service "https://www.googleapis.com/auth/cloud-platform"; public $infoTypes; + public $locations_infoTypes; public $organizations_deidentifyTemplates; public $organizations_inspectTemplates; public $organizations_storedInfoTypes; @@ -82,6 +83,38 @@ class Google_Service_DLP extends Google_Service 'location' => 'query', 'type' => 'string', ), + 'location' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ), + ) + ) + ); + $this->locations_infoTypes = new Google_Service_DLP_Resource_LocationsInfoTypes( + $this, + $this->serviceName, + 'infoTypes', + array( + 'methods' => array( + 'list' => array( + 'path' => 'v2/locations/{location}/infoTypes', + 'httpMethod' => 'GET', + 'parameters' => array( + 'location' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'languageCode' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ), ) @@ -204,10 +237,6 @@ class Google_Service_DLP extends Google_Service 'type' => 'string', 'required' => true, ), - 'pageSize' => array( - 'location' => 'query', - 'type' => 'integer', - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -216,6 +245,10 @@ class Google_Service_DLP extends Google_Service 'location' => 'query', 'type' => 'string', ), + 'pageSize' => array( + 'location' => 'query', + 'type' => 'integer', + ), ), ),'patch' => array( 'path' => 'v2/{+name}', @@ -694,6 +727,36 @@ class Google_Service_DLP extends Google_Service 'required' => true, ), ), + ),'inspect' => array( + 'path' => 'v2/{+parent}/locations/{location}/content:inspect', + 'httpMethod' => 'POST', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'location' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'reidentify' => array( + 'path' => 'v2/{+parent}/locations/{location}/content:reidentify', + 'httpMethod' => 'POST', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'location' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), ), ) ) diff --git a/vendor/google/apiclient-services/src/Google/Service/DLP/GooglePrivacyDlpV2InspectContentRequest.php b/vendor/google/apiclient-services/src/Google/Service/DLP/GooglePrivacyDlpV2InspectContentRequest.php index aaf54e5..c15693a 100644 --- a/vendor/google/apiclient-services/src/Google/Service/DLP/GooglePrivacyDlpV2InspectContentRequest.php +++ b/vendor/google/apiclient-services/src/Google/Service/DLP/GooglePrivacyDlpV2InspectContentRequest.php @@ -22,6 +22,7 @@ class Google_Service_DLP_GooglePrivacyDlpV2InspectContentRequest extends Google_ public $inspectTemplateName; protected $itemType = 'Google_Service_DLP_GooglePrivacyDlpV2ContentItem'; protected $itemDataType = ''; + public $location; /** * @param Google_Service_DLP_GooglePrivacyDlpV2InspectConfig @@ -59,4 +60,12 @@ class Google_Service_DLP_GooglePrivacyDlpV2InspectContentRequest extends Google_ { return $this->item; } + public function setLocation($location) + { + $this->location = $location; + } + public function getLocation() + { + return $this->location; + } } diff --git a/vendor/google/apiclient-services/src/Google/Service/DLP/GooglePrivacyDlpV2ReidentifyContentRequest.php b/vendor/google/apiclient-services/src/Google/Service/DLP/GooglePrivacyDlpV2ReidentifyContentRequest.php index bcf0fa8..83174d5 100644 --- a/vendor/google/apiclient-services/src/Google/Service/DLP/GooglePrivacyDlpV2ReidentifyContentRequest.php +++ b/vendor/google/apiclient-services/src/Google/Service/DLP/GooglePrivacyDlpV2ReidentifyContentRequest.php @@ -22,6 +22,7 @@ class Google_Service_DLP_GooglePrivacyDlpV2ReidentifyContentRequest extends Goog public $inspectTemplateName; protected $itemType = 'Google_Service_DLP_GooglePrivacyDlpV2ContentItem'; protected $itemDataType = ''; + public $location; protected $reidentifyConfigType = 'Google_Service_DLP_GooglePrivacyDlpV2DeidentifyConfig'; protected $reidentifyConfigDataType = ''; public $reidentifyTemplateName; @@ -62,6 +63,14 @@ class Google_Service_DLP_GooglePrivacyDlpV2ReidentifyContentRequest extends Goog { return $this->item; } + public function setLocation($location) + { + $this->location = $location; + } + public function getLocation() + { + return $this->location; + } /** * @param Google_Service_DLP_GooglePrivacyDlpV2DeidentifyConfig */ diff --git a/vendor/google/apiclient-services/src/Google/Service/DLP/Resource/InfoTypes.php b/vendor/google/apiclient-services/src/Google/Service/DLP/Resource/InfoTypes.php index 25f5eab..5d7d731 100644 --- a/vendor/google/apiclient-services/src/Google/Service/DLP/Resource/InfoTypes.php +++ b/vendor/google/apiclient-services/src/Google/Service/DLP/Resource/InfoTypes.php @@ -37,6 +37,8 @@ class Google_Service_DLP_Resource_InfoTypes extends Google_Service_Resource * available, en-US strings will be returned. * @opt_param string filter Optional filter to only return infoTypes supported * by certain parts of the API. Defaults to supported_by=INSPECT. + * @opt_param string location The geographic location to list info types. + * Reserved for future extensions. * @return Google_Service_DLP_GooglePrivacyDlpV2ListInfoTypesResponse */ public function listInfoTypes($optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/DLP/Resource/Locations.php b/vendor/google/apiclient-services/src/Google/Service/DLP/Resource/Locations.php new file mode 100644 index 0000000..3f32638 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/DLP/Resource/Locations.php @@ -0,0 +1,28 @@ + + * $dlpService = new Google_Service_DLP(...); + * $locations = $dlpService->locations; + * + */ +class Google_Service_DLP_Resource_Locations extends Google_Service_Resource +{ +} diff --git a/vendor/google/apiclient-services/src/Google/Service/DLP/Resource/LocationsInfoTypes.php b/vendor/google/apiclient-services/src/Google/Service/DLP/Resource/LocationsInfoTypes.php new file mode 100644 index 0000000..12af9e1 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/DLP/Resource/LocationsInfoTypes.php @@ -0,0 +1,50 @@ + + * $dlpService = new Google_Service_DLP(...); + * $infoTypes = $dlpService->infoTypes; + * + */ +class Google_Service_DLP_Resource_LocationsInfoTypes extends Google_Service_Resource +{ + /** + * Returns a list of the sensitive information types that the DLP API supports. + * See https://cloud.google.com/dlp/docs/infotypes-reference to learn more. + * (infoTypes.listLocationsInfoTypes) + * + * @param string $location The geographic location to list info types. Reserved + * for future extensions. + * @param array $optParams Optional parameters. + * + * @opt_param string languageCode Optional BCP-47 language code for localized + * infoType friendly names. If omitted, or if localized strings are not + * available, en-US strings will be returned. + * @opt_param string filter Optional filter to only return infoTypes supported + * by certain parts of the API. Defaults to supported_by=INSPECT. + * @return Google_Service_DLP_GooglePrivacyDlpV2ListInfoTypesResponse + */ + public function listLocationsInfoTypes($location, $optParams = array()) + { + $params = array('location' => $location); + $params = array_merge($params, $optParams); + return $this->call('list', array($params), "Google_Service_DLP_GooglePrivacyDlpV2ListInfoTypesResponse"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/DLP/Resource/OrganizationsInspectTemplates.php b/vendor/google/apiclient-services/src/Google/Service/DLP/Resource/OrganizationsInspectTemplates.php index 8e79c97..7c3db6e 100644 --- a/vendor/google/apiclient-services/src/Google/Service/DLP/Resource/OrganizationsInspectTemplates.php +++ b/vendor/google/apiclient-services/src/Google/Service/DLP/Resource/OrganizationsInspectTemplates.php @@ -83,8 +83,6 @@ class Google_Service_DLP_Resource_OrganizationsInspectTemplates extends Google_S * project-id or organizations/my-org-id. * @param array $optParams Optional parameters. * - * @opt_param int pageSize Optional size of the page, can be limited by server. - * If zero server returns a page of max size 100. * @opt_param string pageToken Optional page token to continue retrieval. Comes * from previous call to `ListInspectTemplates`. * @opt_param string orderBy Optional comma separated list of fields to order @@ -100,6 +98,8 @@ class Google_Service_DLP_Resource_OrganizationsInspectTemplates extends Google_S * `update_time`: corresponds to time the template was last updated. - `name`: * corresponds to template's name. - `display_name`: corresponds to template's * display name. + * @opt_param int pageSize Optional size of the page, can be limited by server. + * If zero server returns a page of max size 100. * @return Google_Service_DLP_GooglePrivacyDlpV2ListInspectTemplatesResponse */ public function listOrganizationsInspectTemplates($parent, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/DLP/Resource/ProjectsLocationsContent.php b/vendor/google/apiclient-services/src/Google/Service/DLP/Resource/ProjectsLocationsContent.php index 33ba2b3..6c7abc6 100644 --- a/vendor/google/apiclient-services/src/Google/Service/DLP/Resource/ProjectsLocationsContent.php +++ b/vendor/google/apiclient-services/src/Google/Service/DLP/Resource/ProjectsLocationsContent.php @@ -49,4 +49,47 @@ class Google_Service_DLP_Resource_ProjectsLocationsContent extends Google_Servic $params = array_merge($params, $optParams); return $this->call('deidentify', array($params), "Google_Service_DLP_GooglePrivacyDlpV2DeidentifyContentResponse"); } + /** + * Finds potentially sensitive info in content. This method has limits on input + * size, processing time, and output size. + * + * When no InfoTypes or CustomInfoTypes are specified in this request, the + * system will automatically choose what detectors to run. By default this may + * be all types, but may change over time as detectors are updated. + * + * For how to guides, see https://cloud.google.com/dlp/docs/inspecting-images + * and https://cloud.google.com/dlp/docs/inspecting-text, (content.inspect) + * + * @param string $parent The parent resource name, for example projects/my- + * project-id. + * @param string $location The geographic location to process content + * inspection. Reserved for future extensions. + * @param Google_Service_DLP_GooglePrivacyDlpV2InspectContentRequest $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_DLP_GooglePrivacyDlpV2InspectContentResponse + */ + public function inspect($parent, $location, Google_Service_DLP_GooglePrivacyDlpV2InspectContentRequest $postBody, $optParams = array()) + { + $params = array('parent' => $parent, 'location' => $location, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('inspect', array($params), "Google_Service_DLP_GooglePrivacyDlpV2InspectContentResponse"); + } + /** + * Re-identifies content that has been de-identified. See + * https://cloud.google.com/dlp/docs/pseudonymization#re- + * identification_in_free_text_code_example to learn more. (content.reidentify) + * + * @param string $parent The parent resource name. + * @param string $location The geographic location to process content + * reidentification. Reserved for future extensions. + * @param Google_Service_DLP_GooglePrivacyDlpV2ReidentifyContentRequest $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_DLP_GooglePrivacyDlpV2ReidentifyContentResponse + */ + public function reidentify($parent, $location, Google_Service_DLP_GooglePrivacyDlpV2ReidentifyContentRequest $postBody, $optParams = array()) + { + $params = array('parent' => $parent, 'location' => $location, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('reidentify', array($params), "Google_Service_DLP_GooglePrivacyDlpV2ReidentifyContentResponse"); + } } diff --git a/vendor/google/apiclient-services/src/Google/Service/DataFusion.php b/vendor/google/apiclient-services/src/Google/Service/DataFusion.php index 66a37a6..061f127 100644 --- a/vendor/google/apiclient-services/src/Google/Service/DataFusion.php +++ b/vendor/google/apiclient-services/src/Google/Service/DataFusion.php @@ -150,6 +150,10 @@ class Google_Service_DataFusion extends Google_Service 'type' => 'string', 'required' => true, ), + 'options.requestedPolicyVersion' => array( + 'location' => 'query', + 'type' => 'integer', + ), ), ),'list' => array( 'path' => 'v1beta1/{+parent}/instances', diff --git a/vendor/google/apiclient-services/src/Google/Service/DataFusion/AuditLogConfig.php b/vendor/google/apiclient-services/src/Google/Service/DataFusion/AuditLogConfig.php index 425fa50..44df34f 100644 --- a/vendor/google/apiclient-services/src/Google/Service/DataFusion/AuditLogConfig.php +++ b/vendor/google/apiclient-services/src/Google/Service/DataFusion/AuditLogConfig.php @@ -19,6 +19,7 @@ class Google_Service_DataFusion_AuditLogConfig extends Google_Collection { protected $collection_key = 'exemptedMembers'; public $exemptedMembers; + public $ignoreChildExemptions; public $logType; public function setExemptedMembers($exemptedMembers) @@ -29,6 +30,14 @@ class Google_Service_DataFusion_AuditLogConfig extends Google_Collection { return $this->exemptedMembers; } + public function setIgnoreChildExemptions($ignoreChildExemptions) + { + $this->ignoreChildExemptions = $ignoreChildExemptions; + } + public function getIgnoreChildExemptions() + { + return $this->ignoreChildExemptions; + } public function setLogType($logType) { $this->logType = $logType; diff --git a/vendor/google/apiclient-services/src/Google/Service/DataFusion/CounterOptions.php b/vendor/google/apiclient-services/src/Google/Service/DataFusion/CounterOptions.php index 44fee43..049e36c 100644 --- a/vendor/google/apiclient-services/src/Google/Service/DataFusion/CounterOptions.php +++ b/vendor/google/apiclient-services/src/Google/Service/DataFusion/CounterOptions.php @@ -15,11 +15,28 @@ * the License. */ -class Google_Service_DataFusion_CounterOptions extends Google_Model +class Google_Service_DataFusion_CounterOptions extends Google_Collection { + protected $collection_key = 'customFields'; + protected $customFieldsType = 'Google_Service_DataFusion_CustomField'; + protected $customFieldsDataType = 'array'; public $field; public $metric; + /** + * @param Google_Service_DataFusion_CustomField + */ + public function setCustomFields($customFields) + { + $this->customFields = $customFields; + } + /** + * @return Google_Service_DataFusion_CustomField + */ + public function getCustomFields() + { + return $this->customFields; + } public function setField($field) { $this->field = $field; diff --git a/vendor/google/apiclient-services/src/Google/Service/DataFusion/CustomField.php b/vendor/google/apiclient-services/src/Google/Service/DataFusion/CustomField.php new file mode 100644 index 0000000..6d103c4 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/DataFusion/CustomField.php @@ -0,0 +1,39 @@ +name = $name; + } + public function getName() + { + return $this->name; + } + public function setValue($value) + { + $this->value = $value; + } + public function getValue() + { + return $this->value; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/DataFusion/Instance.php b/vendor/google/apiclient-services/src/Google/Service/DataFusion/Instance.php index cdc2806..b02790e 100644 --- a/vendor/google/apiclient-services/src/Google/Service/DataFusion/Instance.php +++ b/vendor/google/apiclient-services/src/Google/Service/DataFusion/Instance.php @@ -15,8 +15,12 @@ * the License. */ -class Google_Service_DataFusion_Instance extends Google_Model +class Google_Service_DataFusion_Instance extends Google_Collection { + protected $collection_key = 'availableVersion'; + public $apiEndpoint; + protected $availableVersionType = 'Google_Service_DataFusion_Version'; + protected $availableVersionDataType = 'array'; public $createTime; public $description; public $displayName; @@ -37,6 +41,28 @@ class Google_Service_DataFusion_Instance extends Google_Model public $version; public $zone; + public function setApiEndpoint($apiEndpoint) + { + $this->apiEndpoint = $apiEndpoint; + } + public function getApiEndpoint() + { + return $this->apiEndpoint; + } + /** + * @param Google_Service_DataFusion_Version + */ + public function setAvailableVersion($availableVersion) + { + $this->availableVersion = $availableVersion; + } + /** + * @return Google_Service_DataFusion_Version + */ + public function getAvailableVersion() + { + return $this->availableVersion; + } public function setCreateTime($createTime) { $this->createTime = $createTime; diff --git a/vendor/google/apiclient-services/src/Google/Service/DataFusion/Resource/ProjectsLocationsInstances.php b/vendor/google/apiclient-services/src/Google/Service/DataFusion/Resource/ProjectsLocationsInstances.php index 5ad0390..57df5ae 100644 --- a/vendor/google/apiclient-services/src/Google/Service/DataFusion/Resource/ProjectsLocationsInstances.php +++ b/vendor/google/apiclient-services/src/Google/Service/DataFusion/Resource/ProjectsLocationsInstances.php @@ -79,6 +79,16 @@ class Google_Service_DataFusion_Resource_ProjectsLocationsInstances extends Goog * requested. See the operation documentation for the appropriate value for this * field. * @param array $optParams Optional parameters. + * + * @opt_param int options.requestedPolicyVersion Optional. The policy format + * version to be returned. + * + * Valid values are 0, 1, and 3. Requests specifying an invalid value will be + * rejected. + * + * Requests for policies with any conditional bindings must specify version 3. + * Policies without any conditional bindings may specify any valid value or + * leave the field unset. * @return Google_Service_DataFusion_Policy */ public function getIamPolicy($resource, $optParams = array()) @@ -152,7 +162,10 @@ class Google_Service_DataFusion_Resource_ProjectsLocationsInstances extends Goog } /** * Sets the access control policy on the specified resource. Replaces any - * existing policy. (instances.setIamPolicy) + * existing policy. + * + * Can return Public Errors: NOT_FOUND, INVALID_ARGUMENT and PERMISSION_DENIED + * (instances.setIamPolicy) * * @param string $resource REQUIRED: The resource for which the policy is being * specified. See the operation documentation for the appropriate value for this diff --git a/vendor/google/apiclient-services/src/Google/Service/DataFusion/Version.php b/vendor/google/apiclient-services/src/Google/Service/DataFusion/Version.php new file mode 100644 index 0000000..637db4e --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/DataFusion/Version.php @@ -0,0 +1,30 @@ +versionNumber = $versionNumber; + } + public function getVersionNumber() + { + return $this->versionNumber; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dataflow.php b/vendor/google/apiclient-services/src/Google/Service/Dataflow.php index 8c24e34..25f8cc7 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dataflow.php +++ b/vendor/google/apiclient-services/src/Google/Service/Dataflow.php @@ -52,12 +52,9 @@ class Google_Service_Dataflow extends Google_Service public $projects_locations_jobs; public $projects_locations_jobs_debug; public $projects_locations_jobs_messages; - public $projects_locations_jobs_snapshots; public $projects_locations_jobs_workItems; - public $projects_locations_snapshots; public $projects_locations_sql; public $projects_locations_templates; - public $projects_snapshots; public $projects_templates; /** @@ -81,25 +78,7 @@ class Google_Service_Dataflow extends Google_Service 'projects', array( 'methods' => array( - 'deleteSnapshots' => array( - 'path' => 'v1b3/projects/{projectId}/snapshots', - 'httpMethod' => 'DELETE', - 'parameters' => array( - 'projectId' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - 'snapshotId' => array( - 'location' => 'query', - 'type' => 'string', - ), - 'location' => array( - 'location' => 'query', - 'type' => 'string', - ), - ), - ),'workerMessages' => array( + 'workerMessages' => array( 'path' => 'v1b3/projects/{projectId}/WorkerMessages', 'httpMethod' => 'POST', 'parameters' => array( @@ -208,11 +187,11 @@ class Google_Service_Dataflow extends Google_Service 'type' => 'string', 'required' => true, ), - 'startTime' => array( + 'location' => array( 'location' => 'query', 'type' => 'string', ), - 'location' => array( + 'startTime' => array( 'location' => 'query', 'type' => 'string', ), @@ -226,10 +205,6 @@ class Google_Service_Dataflow extends Google_Service 'type' => 'string', 'required' => true, ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), 'location' => array( 'location' => 'query', 'type' => 'string', @@ -246,20 +221,9 @@ class Google_Service_Dataflow extends Google_Service 'location' => 'query', 'type' => 'string', ), - ), - ),'snapshot' => array( - 'path' => 'v1b3/projects/{projectId}/jobs/{jobId}:snapshot', - 'httpMethod' => 'POST', - 'parameters' => array( - 'projectId' => array( - 'location' => 'path', + 'filter' => array( + 'location' => 'query', 'type' => 'string', - 'required' => true, - ), - 'jobId' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, ), ), ),'update' => array( @@ -345,15 +309,11 @@ class Google_Service_Dataflow extends Google_Service 'type' => 'string', 'required' => true, ), - 'location' => array( - 'location' => 'query', - 'type' => 'string', - ), 'endTime' => array( 'location' => 'query', 'type' => 'string', ), - 'pageToken' => array( + 'location' => array( 'location' => 'query', 'type' => 'string', ), @@ -361,6 +321,10 @@ class Google_Service_Dataflow extends Google_Service 'location' => 'query', 'type' => 'string', ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), 'pageSize' => array( 'location' => 'query', 'type' => 'integer', @@ -459,11 +423,11 @@ class Google_Service_Dataflow extends Google_Service 'type' => 'string', 'required' => true, ), - 'replaceJobId' => array( + 'view' => array( 'location' => 'query', 'type' => 'string', ), - 'view' => array( + 'replaceJobId' => array( 'location' => 'query', 'type' => 'string', ), @@ -530,6 +494,10 @@ class Google_Service_Dataflow extends Google_Service 'type' => 'string', 'required' => true, ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -542,30 +510,6 @@ class Google_Service_Dataflow extends Google_Service 'location' => 'query', 'type' => 'string', ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), - ), - ),'snapshot' => array( - 'path' => 'v1b3/projects/{projectId}/locations/{location}/jobs/{jobId}:snapshot', - 'httpMethod' => 'POST', - 'parameters' => array( - 'projectId' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - 'location' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - 'jobId' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), ), ),'update' => array( 'path' => 'v1b3/projects/{projectId}/locations/{location}/jobs/{jobId}', @@ -666,6 +610,10 @@ class Google_Service_Dataflow extends Google_Service 'type' => 'string', 'required' => true, ), + 'minimumImportance' => array( + 'location' => 'query', + 'type' => 'string', + ), 'endTime' => array( 'location' => 'query', 'type' => 'string', @@ -682,40 +630,6 @@ class Google_Service_Dataflow extends Google_Service 'location' => 'query', 'type' => 'integer', ), - 'minimumImportance' => array( - 'location' => 'query', - 'type' => 'string', - ), - ), - ), - ) - ) - ); - $this->projects_locations_jobs_snapshots = new Google_Service_Dataflow_Resource_ProjectsLocationsJobsSnapshots( - $this, - $this->serviceName, - 'snapshots', - array( - 'methods' => array( - 'list' => array( - 'path' => 'v1b3/projects/{projectId}/locations/{location}/jobs/{jobId}/snapshots', - 'httpMethod' => 'GET', - 'parameters' => array( - 'projectId' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - 'location' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - 'jobId' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), ), ), ) @@ -771,75 +685,6 @@ class Google_Service_Dataflow extends Google_Service ) ) ); - $this->projects_locations_snapshots = new Google_Service_Dataflow_Resource_ProjectsLocationsSnapshots( - $this, - $this->serviceName, - 'snapshots', - array( - 'methods' => array( - 'delete' => array( - 'path' => 'v1b3/projects/{projectId}/locations/{location}/snapshots/{snapshotId}', - 'httpMethod' => 'DELETE', - 'parameters' => array( - 'projectId' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - 'location' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - 'snapshotId' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - ), - ),'get' => array( - 'path' => 'v1b3/projects/{projectId}/locations/{location}/snapshots/{snapshotId}', - 'httpMethod' => 'GET', - 'parameters' => array( - 'projectId' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - 'location' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - 'snapshotId' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - ), - ),'list' => array( - 'path' => 'v1b3/projects/{projectId}/locations/{location}/snapshots', - 'httpMethod' => 'GET', - 'parameters' => array( - 'projectId' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - 'location' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - 'jobId' => array( - 'location' => 'query', - 'type' => 'string', - ), - ), - ), - ) - ) - ); $this->projects_locations_sql = new Google_Service_Dataflow_Resource_ProjectsLocationsSql( $this, $this->serviceName, @@ -927,14 +772,6 @@ class Google_Service_Dataflow extends Google_Service 'type' => 'string', 'required' => true, ), - 'dynamicTemplate.gcsPath' => array( - 'location' => 'query', - 'type' => 'string', - ), - 'dynamicTemplate.stagingLocation' => array( - 'location' => 'query', - 'type' => 'string', - ), 'validateOnly' => array( 'location' => 'query', 'type' => 'boolean', @@ -943,50 +780,11 @@ class Google_Service_Dataflow extends Google_Service 'location' => 'query', 'type' => 'string', ), - ), - ), - ) - ) - ); - $this->projects_snapshots = new Google_Service_Dataflow_Resource_ProjectsSnapshots( - $this, - $this->serviceName, - 'snapshots', - array( - 'methods' => array( - 'get' => array( - 'path' => 'v1b3/projects/{projectId}/snapshots/{snapshotId}', - 'httpMethod' => 'GET', - 'parameters' => array( - 'projectId' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - 'snapshotId' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - 'location' => array( + 'dynamicTemplate.gcsPath' => array( 'location' => 'query', 'type' => 'string', ), - ), - ),'list' => array( - 'path' => 'v1b3/projects/{projectId}/snapshots', - 'httpMethod' => 'GET', - 'parameters' => array( - 'projectId' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - 'location' => array( - 'location' => 'query', - 'type' => 'string', - ), - 'jobId' => array( + 'dynamicTemplate.stagingLocation' => array( 'location' => 'query', 'type' => 'string', ), @@ -1020,10 +818,6 @@ class Google_Service_Dataflow extends Google_Service 'type' => 'string', 'required' => true, ), - 'location' => array( - 'location' => 'query', - 'type' => 'string', - ), 'view' => array( 'location' => 'query', 'type' => 'string', @@ -1032,6 +826,10 @@ class Google_Service_Dataflow extends Google_Service 'location' => 'query', 'type' => 'string', ), + 'location' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'launch' => array( 'path' => 'v1b3/projects/{projectId}/templates:launch', @@ -1042,14 +840,6 @@ class Google_Service_Dataflow extends Google_Service 'type' => 'string', 'required' => true, ), - 'validateOnly' => array( - 'location' => 'query', - 'type' => 'boolean', - ), - 'gcsPath' => array( - 'location' => 'query', - 'type' => 'string', - ), 'location' => array( 'location' => 'query', 'type' => 'string', @@ -1062,6 +852,14 @@ class Google_Service_Dataflow extends Google_Service 'location' => 'query', 'type' => 'string', ), + 'validateOnly' => array( + 'location' => 'query', + 'type' => 'boolean', + ), + 'gcsPath' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ), ) diff --git a/vendor/google/apiclient-services/src/Google/Service/Dataflow/Environment.php b/vendor/google/apiclient-services/src/Google/Service/Dataflow/Environment.php index 0dccce4..4a2a47f 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dataflow/Environment.php +++ b/vendor/google/apiclient-services/src/Google/Service/Dataflow/Environment.php @@ -31,6 +31,8 @@ class Google_Service_Dataflow_Environment extends Google_Collection public $version; protected $workerPoolsType = 'Google_Service_Dataflow_WorkerPool'; protected $workerPoolsDataType = 'array'; + public $workerRegion; + public $workerZone; public function setClusterManagerApiService($clusterManagerApiService) { @@ -134,4 +136,20 @@ class Google_Service_Dataflow_Environment extends Google_Collection { return $this->workerPools; } + public function setWorkerRegion($workerRegion) + { + $this->workerRegion = $workerRegion; + } + public function getWorkerRegion() + { + return $this->workerRegion; + } + public function setWorkerZone($workerZone) + { + $this->workerZone = $workerZone; + } + public function getWorkerZone() + { + return $this->workerZone; + } } diff --git a/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/Projects.php b/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/Projects.php index 07e502c..64ee119 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/Projects.php +++ b/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/Projects.php @@ -25,23 +25,6 @@ */ class Google_Service_Dataflow_Resource_Projects extends Google_Service_Resource { - /** - * Deletes a snapshot. (projects.deleteSnapshots) - * - * @param string $projectId The ID of the Cloud Platform project that the - * snapshot belongs to. - * @param array $optParams Optional parameters. - * - * @opt_param string snapshotId The ID of the snapshot. - * @opt_param string location The location that contains this snapshot. - * @return Google_Service_Dataflow_DeleteSnapshotResponse - */ - public function deleteSnapshots($projectId, $optParams = array()) - { - $params = array('projectId' => $projectId); - $params = array_merge($params, $optParams); - return $this->call('deleteSnapshots', array($params), "Google_Service_Dataflow_DeleteSnapshotResponse"); - } /** * Send a worker_message to the service. (projects.workerMessages) * diff --git a/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsJobs.php b/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsJobs.php index bdf4222..5bff572 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsJobs.php +++ b/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsJobs.php @@ -115,12 +115,12 @@ class Google_Service_Dataflow_Resource_ProjectsJobs extends Google_Service_Resou * @param string $jobId The job to get messages for. * @param array $optParams Optional parameters. * - * @opt_param string startTime Return only metric data that has changed since - * this time. Default is to return all information about all metrics for the - * job. * @opt_param string location The [regional endpoint] * (https://cloud.google.com/dataflow/docs/concepts/regional-endpoints) that * contains the job specified by job_id. + * @opt_param string startTime Return only metric data that has changed since + * this time. Default is to return all information about all metrics for the + * job. * @return Google_Service_Dataflow_JobMetrics */ public function getMetrics($projectId, $jobId, $optParams = array()) @@ -142,7 +142,6 @@ class Google_Service_Dataflow_Resource_ProjectsJobs extends Google_Service_Resou * @param string $projectId The project which owns the jobs. * @param array $optParams Optional parameters. * - * @opt_param string filter The kind of filter to use. * @opt_param string location The [regional endpoint] * (https://cloud.google.com/dataflow/docs/concepts/regional-endpoints) that * contains this job. @@ -153,6 +152,7 @@ class Google_Service_Dataflow_Resource_ProjectsJobs extends Google_Service_Resou * max_responses and an unspecified server-defined limit. * @opt_param string view Level of information requested in response. Default is * `JOB_VIEW_SUMMARY`. + * @opt_param string filter The kind of filter to use. * @return Google_Service_Dataflow_ListJobsResponse */ public function listProjectsJobs($projectId, $optParams = array()) @@ -161,21 +161,6 @@ class Google_Service_Dataflow_Resource_ProjectsJobs extends Google_Service_Resou $params = array_merge($params, $optParams); return $this->call('list', array($params), "Google_Service_Dataflow_ListJobsResponse"); } - /** - * Snapshot the state of a streaming job. (jobs.snapshot) - * - * @param string $projectId The project which owns the job to be snapshotted. - * @param string $jobId The job to be snapshotted. - * @param Google_Service_Dataflow_SnapshotJobRequest $postBody - * @param array $optParams Optional parameters. - * @return Google_Service_Dataflow_Snapshot - */ - public function snapshot($projectId, $jobId, Google_Service_Dataflow_SnapshotJobRequest $postBody, $optParams = array()) - { - $params = array('projectId' => $projectId, 'jobId' => $jobId, 'postBody' => $postBody); - $params = array_merge($params, $optParams); - return $this->call('snapshot', array($params), "Google_Service_Dataflow_Snapshot"); - } /** * Updates the state of an existing Cloud Dataflow job. * diff --git a/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsJobsMessages.php b/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsJobsMessages.php index 5d0ffa0..0c54f02 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsJobsMessages.php +++ b/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsJobsMessages.php @@ -39,17 +39,17 @@ class Google_Service_Dataflow_Resource_ProjectsJobsMessages extends Google_Servi * @param string $jobId The job to get messages about. * @param array $optParams Optional parameters. * + * @opt_param string endTime Return only messages with timestamps < end_time. + * The default is now (i.e. return up to the latest messages available). * @opt_param string location The [regional endpoint] * (https://cloud.google.com/dataflow/docs/concepts/regional-endpoints) that * contains the job specified by job_id. - * @opt_param string endTime Return only messages with timestamps < end_time. - * The default is now (i.e. return up to the latest messages available). - * @opt_param string pageToken If supplied, this should be the value of - * next_page_token returned by an earlier call. This will cause the next page of - * results to be returned. * @opt_param string startTime If specified, return only messages with * timestamps >= start_time. The default is the job creation time (i.e. * beginning of messages). + * @opt_param string pageToken If supplied, this should be the value of + * next_page_token returned by an earlier call. This will cause the next page of + * results to be returned. * @opt_param int pageSize If specified, determines the maximum number of * messages to return. If unspecified, the service may choose an appropriate * default, or may return an arbitrarily large number of results. diff --git a/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsLocationsJobs.php b/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsLocationsJobs.php index c8d8572..0ef8b95 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsLocationsJobs.php +++ b/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsLocationsJobs.php @@ -41,9 +41,9 @@ class Google_Service_Dataflow_Resource_ProjectsLocationsJobs extends Google_Serv * @param Google_Service_Dataflow_Job $postBody * @param array $optParams Optional parameters. * + * @opt_param string view The level of information requested in response. * @opt_param string replaceJobId Deprecated. This field is now in the Job * message. - * @opt_param string view The level of information requested in response. * @return Google_Service_Dataflow_Job */ public function create($projectId, $location, Google_Service_Dataflow_Job $postBody, $optParams = array()) @@ -120,6 +120,7 @@ class Google_Service_Dataflow_Resource_ProjectsLocationsJobs extends Google_Serv * contains this job. * @param array $optParams Optional parameters. * + * @opt_param string filter The kind of filter to use. * @opt_param string pageToken Set this to the 'next_page_token' field of a * previous response to request additional results in a long list. * @opt_param int pageSize If there are many jobs, limit response to at most @@ -127,7 +128,6 @@ class Google_Service_Dataflow_Resource_ProjectsLocationsJobs extends Google_Serv * max_responses and an unspecified server-defined limit. * @opt_param string view Level of information requested in response. Default is * `JOB_VIEW_SUMMARY`. - * @opt_param string filter The kind of filter to use. * @return Google_Service_Dataflow_ListJobsResponse */ public function listProjectsLocationsJobs($projectId, $location, $optParams = array()) @@ -136,22 +136,6 @@ class Google_Service_Dataflow_Resource_ProjectsLocationsJobs extends Google_Serv $params = array_merge($params, $optParams); return $this->call('list', array($params), "Google_Service_Dataflow_ListJobsResponse"); } - /** - * Snapshot the state of a streaming job. (jobs.snapshot) - * - * @param string $projectId The project which owns the job to be snapshotted. - * @param string $location The location that contains this job. - * @param string $jobId The job to be snapshotted. - * @param Google_Service_Dataflow_SnapshotJobRequest $postBody - * @param array $optParams Optional parameters. - * @return Google_Service_Dataflow_Snapshot - */ - public function snapshot($projectId, $location, $jobId, Google_Service_Dataflow_SnapshotJobRequest $postBody, $optParams = array()) - { - $params = array('projectId' => $projectId, 'location' => $location, 'jobId' => $jobId, 'postBody' => $postBody); - $params = array_merge($params, $optParams); - return $this->call('snapshot', array($params), "Google_Service_Dataflow_Snapshot"); - } /** * Updates the state of an existing Cloud Dataflow job. * diff --git a/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsLocationsJobsMessages.php b/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsLocationsJobsMessages.php index 3f24024..581294a 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsLocationsJobsMessages.php +++ b/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsLocationsJobsMessages.php @@ -42,6 +42,8 @@ class Google_Service_Dataflow_Resource_ProjectsLocationsJobsMessages extends Goo * @param string $jobId The job to get messages about. * @param array $optParams Optional parameters. * + * @opt_param string minimumImportance Filter to only get messages with + * importance >= level * @opt_param string endTime Return only messages with timestamps < end_time. * The default is now (i.e. return up to the latest messages available). * @opt_param string startTime If specified, return only messages with @@ -53,8 +55,6 @@ class Google_Service_Dataflow_Resource_ProjectsLocationsJobsMessages extends Goo * @opt_param int pageSize If specified, determines the maximum number of * messages to return. If unspecified, the service may choose an appropriate * default, or may return an arbitrarily large number of results. - * @opt_param string minimumImportance Filter to only get messages with - * importance >= level * @return Google_Service_Dataflow_ListJobMessagesResponse */ public function listProjectsLocationsJobsMessages($projectId, $location, $jobId, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsLocationsJobsSnapshots.php b/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsLocationsJobsSnapshots.php deleted file mode 100644 index 796d7ea..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsLocationsJobsSnapshots.php +++ /dev/null @@ -1,43 +0,0 @@ - - * $dataflowService = new Google_Service_Dataflow(...); - * $snapshots = $dataflowService->snapshots; - * - */ -class Google_Service_Dataflow_Resource_ProjectsLocationsJobsSnapshots extends Google_Service_Resource -{ - /** - * Lists snapshots. (snapshots.listProjectsLocationsJobsSnapshots) - * - * @param string $projectId The project ID to list snapshots for. - * @param string $location The location to list snapshots in. - * @param string $jobId If specified, list snapshots created from this job. - * @param array $optParams Optional parameters. - * @return Google_Service_Dataflow_ListSnapshotsResponse - */ - public function listProjectsLocationsJobsSnapshots($projectId, $location, $jobId, $optParams = array()) - { - $params = array('projectId' => $projectId, 'location' => $location, 'jobId' => $jobId); - $params = array_merge($params, $optParams); - return $this->call('list', array($params), "Google_Service_Dataflow_ListSnapshotsResponse"); - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsLocationsSnapshots.php b/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsLocationsSnapshots.php deleted file mode 100644 index a4afc02..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsLocationsSnapshots.php +++ /dev/null @@ -1,76 +0,0 @@ - - * $dataflowService = new Google_Service_Dataflow(...); - * $snapshots = $dataflowService->snapshots; - * - */ -class Google_Service_Dataflow_Resource_ProjectsLocationsSnapshots extends Google_Service_Resource -{ - /** - * Deletes a snapshot. (snapshots.delete) - * - * @param string $projectId The ID of the Cloud Platform project that the - * snapshot belongs to. - * @param string $location The location that contains this snapshot. - * @param string $snapshotId The ID of the snapshot. - * @param array $optParams Optional parameters. - * @return Google_Service_Dataflow_DeleteSnapshotResponse - */ - public function delete($projectId, $location, $snapshotId, $optParams = array()) - { - $params = array('projectId' => $projectId, 'location' => $location, 'snapshotId' => $snapshotId); - $params = array_merge($params, $optParams); - return $this->call('delete', array($params), "Google_Service_Dataflow_DeleteSnapshotResponse"); - } - /** - * Gets information about a snapshot. (snapshots.get) - * - * @param string $projectId The ID of the Cloud Platform project that the - * snapshot belongs to. - * @param string $location The location that contains this snapshot. - * @param string $snapshotId The ID of the snapshot. - * @param array $optParams Optional parameters. - * @return Google_Service_Dataflow_Snapshot - */ - public function get($projectId, $location, $snapshotId, $optParams = array()) - { - $params = array('projectId' => $projectId, 'location' => $location, 'snapshotId' => $snapshotId); - $params = array_merge($params, $optParams); - return $this->call('get', array($params), "Google_Service_Dataflow_Snapshot"); - } - /** - * Lists snapshots. (snapshots.listProjectsLocationsSnapshots) - * - * @param string $projectId The project ID to list snapshots for. - * @param string $location The location to list snapshots in. - * @param array $optParams Optional parameters. - * - * @opt_param string jobId If specified, list snapshots created from this job. - * @return Google_Service_Dataflow_ListSnapshotsResponse - */ - public function listProjectsLocationsSnapshots($projectId, $location, $optParams = array()) - { - $params = array('projectId' => $projectId, 'location' => $location); - $params = array_merge($params, $optParams); - return $this->call('list', array($params), "Google_Service_Dataflow_ListSnapshotsResponse"); - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsLocationsTemplates.php b/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsLocationsTemplates.php index 37c6151..e9df260 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsLocationsTemplates.php +++ b/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsLocationsTemplates.php @@ -76,15 +76,15 @@ class Google_Service_Dataflow_Resource_ProjectsLocationsTemplates extends Google * @param Google_Service_Dataflow_LaunchTemplateParameters $postBody * @param array $optParams Optional parameters. * + * @opt_param bool validateOnly If true, the request is validated but not + * actually executed. Defaults to false. + * @opt_param string gcsPath A Cloud Storage path to the template from which to + * create the job. Must be valid Cloud Storage URL, beginning with 'gs://'. * @opt_param string dynamicTemplate.gcsPath Path to dynamic template spec file * on GCS. The file must be a Json serialized DynamicTemplateFieSpec object. * @opt_param string dynamicTemplate.stagingLocation Cloud Storage path for * staging dependencies. Must be a valid Cloud Storage URL, beginning with * `gs://`. - * @opt_param bool validateOnly If true, the request is validated but not - * actually executed. Defaults to false. - * @opt_param string gcsPath A Cloud Storage path to the template from which to - * create the job. Must be valid Cloud Storage URL, beginning with 'gs://'. * @return Google_Service_Dataflow_LaunchTemplateResponse */ public function launch($projectId, $location, Google_Service_Dataflow_LaunchTemplateParameters $postBody, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsSnapshots.php b/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsSnapshots.php deleted file mode 100644 index 942e6c0..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsSnapshots.php +++ /dev/null @@ -1,61 +0,0 @@ - - * $dataflowService = new Google_Service_Dataflow(...); - * $snapshots = $dataflowService->snapshots; - * - */ -class Google_Service_Dataflow_Resource_ProjectsSnapshots extends Google_Service_Resource -{ - /** - * Gets information about a snapshot. (snapshots.get) - * - * @param string $projectId The ID of the Cloud Platform project that the - * snapshot belongs to. - * @param string $snapshotId The ID of the snapshot. - * @param array $optParams Optional parameters. - * - * @opt_param string location The location that contains this snapshot. - * @return Google_Service_Dataflow_Snapshot - */ - public function get($projectId, $snapshotId, $optParams = array()) - { - $params = array('projectId' => $projectId, 'snapshotId' => $snapshotId); - $params = array_merge($params, $optParams); - return $this->call('get', array($params), "Google_Service_Dataflow_Snapshot"); - } - /** - * Lists snapshots. (snapshots.listProjectsSnapshots) - * - * @param string $projectId The project ID to list snapshots for. - * @param array $optParams Optional parameters. - * - * @opt_param string location The location to list snapshots in. - * @opt_param string jobId If specified, list snapshots created from this job. - * @return Google_Service_Dataflow_ListSnapshotsResponse - */ - public function listProjectsSnapshots($projectId, $optParams = array()) - { - $params = array('projectId' => $projectId); - $params = array_merge($params, $optParams); - return $this->call('list', array($params), "Google_Service_Dataflow_ListSnapshotsResponse"); - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsTemplates.php b/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsTemplates.php index 98f59ae..b9c7e01 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsTemplates.php +++ b/vendor/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsTemplates.php @@ -47,13 +47,13 @@ class Google_Service_Dataflow_Resource_ProjectsTemplates extends Google_Service_ * the job belongs to. * @param array $optParams Optional parameters. * - * @opt_param string location The [regional endpoint] - * (https://cloud.google.com/dataflow/docs/concepts/regional-endpoints) to which - * to direct the request. * @opt_param string view The view to retrieve. Defaults to METADATA_ONLY. * @opt_param string gcsPath Required. A Cloud Storage path to the template from * which to create the job. Must be valid Cloud Storage URL, beginning with * 'gs://'. + * @opt_param string location The [regional endpoint] + * (https://cloud.google.com/dataflow/docs/concepts/regional-endpoints) to which + * to direct the request. * @return Google_Service_Dataflow_GetTemplateResponse */ public function get($projectId, $optParams = array()) @@ -70,10 +70,6 @@ class Google_Service_Dataflow_Resource_ProjectsTemplates extends Google_Service_ * @param Google_Service_Dataflow_LaunchTemplateParameters $postBody * @param array $optParams Optional parameters. * - * @opt_param bool validateOnly If true, the request is validated but not - * actually executed. Defaults to false. - * @opt_param string gcsPath A Cloud Storage path to the template from which to - * create the job. Must be valid Cloud Storage URL, beginning with 'gs://'. * @opt_param string location The [regional endpoint] * (https://cloud.google.com/dataflow/docs/concepts/regional-endpoints) to which * to direct the request. @@ -82,6 +78,10 @@ class Google_Service_Dataflow_Resource_ProjectsTemplates extends Google_Service_ * @opt_param string dynamicTemplate.stagingLocation Cloud Storage path for * staging dependencies. Must be a valid Cloud Storage URL, beginning with * `gs://`. + * @opt_param bool validateOnly If true, the request is validated but not + * actually executed. Defaults to false. + * @opt_param string gcsPath A Cloud Storage path to the template from which to + * create the job. Must be valid Cloud Storage URL, beginning with 'gs://'. * @return Google_Service_Dataflow_LaunchTemplateResponse */ public function launch($projectId, Google_Service_Dataflow_LaunchTemplateParameters $postBody, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Dataflow/RuntimeEnvironment.php b/vendor/google/apiclient-services/src/Google/Service/Dataflow/RuntimeEnvironment.php index 5284bf2..d5b8c22 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dataflow/RuntimeEnvironment.php +++ b/vendor/google/apiclient-services/src/Google/Service/Dataflow/RuntimeEnvironment.php @@ -21,6 +21,7 @@ class Google_Service_Dataflow_RuntimeEnvironment extends Google_Collection public $additionalExperiments; public $additionalUserLabels; public $bypassTempDirValidation; + public $ipConfiguration; public $kmsKeyName; public $machineType; public $maxWorkers; @@ -29,6 +30,8 @@ class Google_Service_Dataflow_RuntimeEnvironment extends Google_Collection public $serviceAccountEmail; public $subnetwork; public $tempLocation; + public $workerRegion; + public $workerZone; public $zone; public function setAdditionalExperiments($additionalExperiments) @@ -55,6 +58,14 @@ class Google_Service_Dataflow_RuntimeEnvironment extends Google_Collection { return $this->bypassTempDirValidation; } + public function setIpConfiguration($ipConfiguration) + { + $this->ipConfiguration = $ipConfiguration; + } + public function getIpConfiguration() + { + return $this->ipConfiguration; + } public function setKmsKeyName($kmsKeyName) { $this->kmsKeyName = $kmsKeyName; @@ -119,6 +130,22 @@ class Google_Service_Dataflow_RuntimeEnvironment extends Google_Collection { return $this->tempLocation; } + public function setWorkerRegion($workerRegion) + { + $this->workerRegion = $workerRegion; + } + public function getWorkerRegion() + { + return $this->workerRegion; + } + public function setWorkerZone($workerZone) + { + $this->workerZone = $workerZone; + } + public function getWorkerZone() + { + return $this->workerZone; + } public function setZone($zone) { $this->zone = $zone; diff --git a/vendor/google/apiclient-services/src/Google/Service/Dataflow/Snapshot.php b/vendor/google/apiclient-services/src/Google/Service/Dataflow/Snapshot.php deleted file mode 100644 index 1e69bfb..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Dataflow/Snapshot.php +++ /dev/null @@ -1,75 +0,0 @@ -creationTime = $creationTime; - } - public function getCreationTime() - { - return $this->creationTime; - } - public function setId($id) - { - $this->id = $id; - } - public function getId() - { - return $this->id; - } - public function setProjectId($projectId) - { - $this->projectId = $projectId; - } - public function getProjectId() - { - return $this->projectId; - } - public function setSourceJobId($sourceJobId) - { - $this->sourceJobId = $sourceJobId; - } - public function getSourceJobId() - { - return $this->sourceJobId; - } - public function setState($state) - { - $this->state = $state; - } - public function getState() - { - return $this->state; - } - public function setTtl($ttl) - { - $this->ttl = $ttl; - } - public function getTtl() - { - return $this->ttl; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dataflow/StreamingConfigTask.php b/vendor/google/apiclient-services/src/Google/Service/Dataflow/StreamingConfigTask.php index 8f6561b..6cc2b60 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dataflow/StreamingConfigTask.php +++ b/vendor/google/apiclient-services/src/Google/Service/Dataflow/StreamingConfigTask.php @@ -18,6 +18,8 @@ class Google_Service_Dataflow_StreamingConfigTask extends Google_Collection { protected $collection_key = 'streamingComputationConfigs'; + public $commitStreamChunkSizeBytes; + public $getDataStreamChunkSizeBytes; public $maxWorkItemCommitBytes; protected $streamingComputationConfigsType = 'Google_Service_Dataflow_StreamingComputationConfig'; protected $streamingComputationConfigsDataType = 'array'; @@ -25,6 +27,22 @@ class Google_Service_Dataflow_StreamingConfigTask extends Google_Collection public $windmillServiceEndpoint; public $windmillServicePort; + public function setCommitStreamChunkSizeBytes($commitStreamChunkSizeBytes) + { + $this->commitStreamChunkSizeBytes = $commitStreamChunkSizeBytes; + } + public function getCommitStreamChunkSizeBytes() + { + return $this->commitStreamChunkSizeBytes; + } + public function setGetDataStreamChunkSizeBytes($getDataStreamChunkSizeBytes) + { + $this->getDataStreamChunkSizeBytes = $getDataStreamChunkSizeBytes; + } + public function getGetDataStreamChunkSizeBytes() + { + return $this->getDataStreamChunkSizeBytes; + } public function setMaxWorkItemCommitBytes($maxWorkItemCommitBytes) { $this->maxWorkItemCommitBytes = $maxWorkItemCommitBytes; diff --git a/vendor/google/apiclient-services/src/Google/Service/Dataproc.php b/vendor/google/apiclient-services/src/Google/Service/Dataproc.php index d771971..10dca92 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dataproc.php +++ b/vendor/google/apiclient-services/src/Google/Service/Dataproc.php @@ -34,7 +34,9 @@ class Google_Service_Dataproc extends Google_Service const CLOUD_PLATFORM = "https://www.googleapis.com/auth/cloud-platform"; + public $projects_locations_autoscalingPolicies; public $projects_locations_workflowTemplates; + public $projects_regions_autoscalingPolicies; public $projects_regions_clusters; public $projects_regions_jobs; public $projects_regions_operations; @@ -55,6 +57,104 @@ class Google_Service_Dataproc extends Google_Service $this->version = 'v1'; $this->serviceName = 'dataproc'; + $this->projects_locations_autoscalingPolicies = new Google_Service_Dataproc_Resource_ProjectsLocationsAutoscalingPolicies( + $this, + $this->serviceName, + 'autoscalingPolicies', + array( + 'methods' => array( + 'create' => array( + 'path' => 'v1/{+parent}/autoscalingPolicies', + 'httpMethod' => 'POST', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'delete' => array( + 'path' => 'v1/{+name}', + 'httpMethod' => 'DELETE', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'get' => array( + 'path' => 'v1/{+name}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'getIamPolicy' => array( + 'path' => 'v1/{+resource}:getIamPolicy', + 'httpMethod' => 'POST', + 'parameters' => array( + 'resource' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'list' => array( + 'path' => 'v1/{+parent}/autoscalingPolicies', + 'httpMethod' => 'GET', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'pageSize' => array( + 'location' => 'query', + 'type' => 'integer', + ), + ), + ),'setIamPolicy' => array( + 'path' => 'v1/{+resource}:setIamPolicy', + 'httpMethod' => 'POST', + 'parameters' => array( + 'resource' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'testIamPermissions' => array( + 'path' => 'v1/{+resource}:testIamPermissions', + 'httpMethod' => 'POST', + 'parameters' => array( + 'resource' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'update' => array( + 'path' => 'v1/{+name}', + 'httpMethod' => 'PUT', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ), + ) + ) + ); $this->projects_locations_workflowTemplates = new Google_Service_Dataproc_Resource_ProjectsLocationsWorkflowTemplates( $this, $this->serviceName, @@ -185,6 +285,104 @@ class Google_Service_Dataproc extends Google_Service ) ) ); + $this->projects_regions_autoscalingPolicies = new Google_Service_Dataproc_Resource_ProjectsRegionsAutoscalingPolicies( + $this, + $this->serviceName, + 'autoscalingPolicies', + array( + 'methods' => array( + 'create' => array( + 'path' => 'v1/{+parent}/autoscalingPolicies', + 'httpMethod' => 'POST', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'delete' => array( + 'path' => 'v1/{+name}', + 'httpMethod' => 'DELETE', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'get' => array( + 'path' => 'v1/{+name}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'getIamPolicy' => array( + 'path' => 'v1/{+resource}:getIamPolicy', + 'httpMethod' => 'POST', + 'parameters' => array( + 'resource' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'list' => array( + 'path' => 'v1/{+parent}/autoscalingPolicies', + 'httpMethod' => 'GET', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'pageSize' => array( + 'location' => 'query', + 'type' => 'integer', + ), + ), + ),'setIamPolicy' => array( + 'path' => 'v1/{+resource}:setIamPolicy', + 'httpMethod' => 'POST', + 'parameters' => array( + 'resource' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'testIamPermissions' => array( + 'path' => 'v1/{+resource}:testIamPermissions', + 'httpMethod' => 'POST', + 'parameters' => array( + 'resource' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'update' => array( + 'path' => 'v1/{+name}', + 'httpMethod' => 'PUT', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ), + ) + ) + ); $this->projects_regions_clusters = new Google_Service_Dataproc_Resource_ProjectsRegionsClusters( $this, $this->serviceName, @@ -229,11 +427,11 @@ class Google_Service_Dataproc extends Google_Service 'type' => 'string', 'required' => true, ), - 'requestId' => array( + 'clusterUuid' => array( 'location' => 'query', 'type' => 'string', ), - 'clusterUuid' => array( + 'requestId' => array( 'location' => 'query', 'type' => 'string', ), @@ -302,10 +500,6 @@ class Google_Service_Dataproc extends Google_Service 'type' => 'string', 'required' => true, ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -314,6 +508,10 @@ class Google_Service_Dataproc extends Google_Service 'location' => 'query', 'type' => 'integer', ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'patch' => array( 'path' => 'v1/projects/{projectId}/regions/{region}/clusters/{clusterName}', @@ -461,6 +659,14 @@ class Google_Service_Dataproc extends Google_Service 'type' => 'string', 'required' => true, ), + 'clusterName' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), 'jobStateMatcher' => array( 'location' => 'query', 'type' => 'string', @@ -473,14 +679,6 @@ class Google_Service_Dataproc extends Google_Service 'location' => 'query', 'type' => 'integer', ), - 'clusterName' => array( - 'location' => 'query', - 'type' => 'string', - ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), ), ),'patch' => array( 'path' => 'v1/projects/{projectId}/regions/{region}/jobs/{jobId}', diff --git a/vendor/google/apiclient-services/src/Google/Service/Dataproc/AutoscalingConfig.php b/vendor/google/apiclient-services/src/Google/Service/Dataproc/AutoscalingConfig.php new file mode 100644 index 0000000..e251751 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Dataproc/AutoscalingConfig.php @@ -0,0 +1,30 @@ +policyUri = $policyUri; + } + public function getPolicyUri() + { + return $this->policyUri; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dataproc/AutoscalingPolicy.php b/vendor/google/apiclient-services/src/Google/Service/Dataproc/AutoscalingPolicy.php new file mode 100644 index 0000000..3d6ae0a --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Dataproc/AutoscalingPolicy.php @@ -0,0 +1,87 @@ +basicAlgorithm = $basicAlgorithm; + } + /** + * @return Google_Service_Dataproc_BasicAutoscalingAlgorithm + */ + public function getBasicAlgorithm() + { + return $this->basicAlgorithm; + } + 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; + } + /** + * @param Google_Service_Dataproc_InstanceGroupAutoscalingPolicyConfig + */ + public function setSecondaryWorkerConfig(Google_Service_Dataproc_InstanceGroupAutoscalingPolicyConfig $secondaryWorkerConfig) + { + $this->secondaryWorkerConfig = $secondaryWorkerConfig; + } + /** + * @return Google_Service_Dataproc_InstanceGroupAutoscalingPolicyConfig + */ + public function getSecondaryWorkerConfig() + { + return $this->secondaryWorkerConfig; + } + /** + * @param Google_Service_Dataproc_InstanceGroupAutoscalingPolicyConfig + */ + public function setWorkerConfig(Google_Service_Dataproc_InstanceGroupAutoscalingPolicyConfig $workerConfig) + { + $this->workerConfig = $workerConfig; + } + /** + * @return Google_Service_Dataproc_InstanceGroupAutoscalingPolicyConfig + */ + public function getWorkerConfig() + { + return $this->workerConfig; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dataproc/BasicAutoscalingAlgorithm.php b/vendor/google/apiclient-services/src/Google/Service/Dataproc/BasicAutoscalingAlgorithm.php new file mode 100644 index 0000000..bc95bb4 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Dataproc/BasicAutoscalingAlgorithm.php @@ -0,0 +1,46 @@ +cooldownPeriod = $cooldownPeriod; + } + public function getCooldownPeriod() + { + return $this->cooldownPeriod; + } + /** + * @param Google_Service_Dataproc_BasicYarnAutoscalingConfig + */ + public function setYarnConfig(Google_Service_Dataproc_BasicYarnAutoscalingConfig $yarnConfig) + { + $this->yarnConfig = $yarnConfig; + } + /** + * @return Google_Service_Dataproc_BasicYarnAutoscalingConfig + */ + public function getYarnConfig() + { + return $this->yarnConfig; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dataproc/BasicYarnAutoscalingConfig.php b/vendor/google/apiclient-services/src/Google/Service/Dataproc/BasicYarnAutoscalingConfig.php new file mode 100644 index 0000000..babdf1c --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Dataproc/BasicYarnAutoscalingConfig.php @@ -0,0 +1,66 @@ +gracefulDecommissionTimeout = $gracefulDecommissionTimeout; + } + public function getGracefulDecommissionTimeout() + { + return $this->gracefulDecommissionTimeout; + } + public function setScaleDownFactor($scaleDownFactor) + { + $this->scaleDownFactor = $scaleDownFactor; + } + public function getScaleDownFactor() + { + return $this->scaleDownFactor; + } + public function setScaleDownMinWorkerFraction($scaleDownMinWorkerFraction) + { + $this->scaleDownMinWorkerFraction = $scaleDownMinWorkerFraction; + } + public function getScaleDownMinWorkerFraction() + { + return $this->scaleDownMinWorkerFraction; + } + public function setScaleUpFactor($scaleUpFactor) + { + $this->scaleUpFactor = $scaleUpFactor; + } + public function getScaleUpFactor() + { + return $this->scaleUpFactor; + } + public function setScaleUpMinWorkerFraction($scaleUpMinWorkerFraction) + { + $this->scaleUpMinWorkerFraction = $scaleUpMinWorkerFraction; + } + public function getScaleUpMinWorkerFraction() + { + return $this->scaleUpMinWorkerFraction; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dataproc/ClusterConfig.php b/vendor/google/apiclient-services/src/Google/Service/Dataproc/ClusterConfig.php index 880fe6f..6ba6cad 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dataproc/ClusterConfig.php +++ b/vendor/google/apiclient-services/src/Google/Service/Dataproc/ClusterConfig.php @@ -18,6 +18,8 @@ class Google_Service_Dataproc_ClusterConfig extends Google_Collection { protected $collection_key = 'initializationActions'; + protected $autoscalingConfigType = 'Google_Service_Dataproc_AutoscalingConfig'; + protected $autoscalingConfigDataType = ''; public $configBucket; protected $encryptionConfigType = 'Google_Service_Dataproc_EncryptionConfig'; protected $encryptionConfigDataType = ''; @@ -38,6 +40,20 @@ class Google_Service_Dataproc_ClusterConfig extends Google_Collection protected $workerConfigType = 'Google_Service_Dataproc_InstanceGroupConfig'; protected $workerConfigDataType = ''; + /** + * @param Google_Service_Dataproc_AutoscalingConfig + */ + public function setAutoscalingConfig(Google_Service_Dataproc_AutoscalingConfig $autoscalingConfig) + { + $this->autoscalingConfig = $autoscalingConfig; + } + /** + * @return Google_Service_Dataproc_AutoscalingConfig + */ + public function getAutoscalingConfig() + { + return $this->autoscalingConfig; + } public function setConfigBucket($configBucket) { $this->configBucket = $configBucket; diff --git a/vendor/google/apiclient-services/src/Google/Service/Dataproc/InstanceGroupAutoscalingPolicyConfig.php b/vendor/google/apiclient-services/src/Google/Service/Dataproc/InstanceGroupAutoscalingPolicyConfig.php new file mode 100644 index 0000000..dac7027 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Dataproc/InstanceGroupAutoscalingPolicyConfig.php @@ -0,0 +1,48 @@ +maxInstances = $maxInstances; + } + public function getMaxInstances() + { + return $this->maxInstances; + } + public function setMinInstances($minInstances) + { + $this->minInstances = $minInstances; + } + public function getMinInstances() + { + return $this->minInstances; + } + public function setWeight($weight) + { + $this->weight = $weight; + } + public function getWeight() + { + return $this->weight; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dataproc/KerberosConfig.php b/vendor/google/apiclient-services/src/Google/Service/Dataproc/KerberosConfig.php index 42c5a44..c14589d 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dataproc/KerberosConfig.php +++ b/vendor/google/apiclient-services/src/Google/Service/Dataproc/KerberosConfig.php @@ -27,6 +27,7 @@ class Google_Service_Dataproc_KerberosConfig extends Google_Model public $keystorePasswordUri; public $keystoreUri; public $kmsKeyUri; + public $realm; public $rootPrincipalPasswordUri; public $tgtLifetimeHours; public $truststorePasswordUri; @@ -112,6 +113,14 @@ class Google_Service_Dataproc_KerberosConfig extends Google_Model { return $this->kmsKeyUri; } + public function setRealm($realm) + { + $this->realm = $realm; + } + public function getRealm() + { + return $this->realm; + } public function setRootPrincipalPasswordUri($rootPrincipalPasswordUri) { $this->rootPrincipalPasswordUri = $rootPrincipalPasswordUri; diff --git a/vendor/google/apiclient-services/src/Google/Service/Dataproc/ListAutoscalingPoliciesResponse.php b/vendor/google/apiclient-services/src/Google/Service/Dataproc/ListAutoscalingPoliciesResponse.php new file mode 100644 index 0000000..54fe56f --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Dataproc/ListAutoscalingPoliciesResponse.php @@ -0,0 +1,47 @@ +nextPageToken = $nextPageToken; + } + public function getNextPageToken() + { + return $this->nextPageToken; + } + /** + * @param Google_Service_Dataproc_AutoscalingPolicy + */ + public function setPolicies($policies) + { + $this->policies = $policies; + } + /** + * @return Google_Service_Dataproc_AutoscalingPolicy + */ + public function getPolicies() + { + return $this->policies; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsLocationsAutoscalingPolicies.php b/vendor/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsLocationsAutoscalingPolicies.php new file mode 100644 index 0000000..90dc62c --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsLocationsAutoscalingPolicies.php @@ -0,0 +1,194 @@ + + * $dataprocService = new Google_Service_Dataproc(...); + * $autoscalingPolicies = $dataprocService->autoscalingPolicies; + * + */ +class Google_Service_Dataproc_Resource_ProjectsLocationsAutoscalingPolicies extends Google_Service_Resource +{ + /** + * Creates new autoscaling policy. (autoscalingPolicies.create) + * + * @param string $parent Required. The "resource name" of the region or + * location, as described in + * https://cloud.google.com/apis/design/resource_names. For + * projects.regions.autoscalingPolicies.create, the resource name of the region + * has the following format: projects/{project_id}/regions/{region} For + * projects.locations.autoscalingPolicies.create, the resource name of the + * location has the following format: + * projects/{project_id}/locations/{location} + * @param Google_Service_Dataproc_AutoscalingPolicy $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_Dataproc_AutoscalingPolicy + */ + public function create($parent, Google_Service_Dataproc_AutoscalingPolicy $postBody, $optParams = array()) + { + $params = array('parent' => $parent, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('create', array($params), "Google_Service_Dataproc_AutoscalingPolicy"); + } + /** + * Deletes an autoscaling policy. It is an error to delete an autoscaling policy + * that is in use by one or more clusters. (autoscalingPolicies.delete) + * + * @param string $name Required. The "resource name" of the autoscaling policy, + * as described in https://cloud.google.com/apis/design/resource_names. For + * projects.regions.autoscalingPolicies.delete, the resource name of the policy + * has the following format: + * projects/{project_id}/regions/{region}/autoscalingPolicies/{policy_id} For + * projects.locations.autoscalingPolicies.delete, the resource name of the + * policy has the following format: + * projects/{project_id}/locations/{location}/autoscalingPolicies/{policy_id} + * @param array $optParams Optional parameters. + * @return Google_Service_Dataproc_DataprocEmpty + */ + public function delete($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('delete', array($params), "Google_Service_Dataproc_DataprocEmpty"); + } + /** + * Retrieves autoscaling policy. (autoscalingPolicies.get) + * + * @param string $name Required. The "resource name" of the autoscaling policy, + * as described in https://cloud.google.com/apis/design/resource_names. For + * projects.regions.autoscalingPolicies.get, the resource name of the policy + * has the following format: + * projects/{project_id}/regions/{region}/autoscalingPolicies/{policy_id} For + * projects.locations.autoscalingPolicies.get, the resource name of the policy + * has the following format: + * projects/{project_id}/locations/{location}/autoscalingPolicies/{policy_id} + * @param array $optParams Optional parameters. + * @return Google_Service_Dataproc_AutoscalingPolicy + */ + public function get($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('get', array($params), "Google_Service_Dataproc_AutoscalingPolicy"); + } + /** + * Gets the access control policy for a resource. Returns an empty policy if the + * resource exists and does not have a policy set. + * (autoscalingPolicies.getIamPolicy) + * + * @param string $resource REQUIRED: The resource for which the policy is being + * requested. See the operation documentation for the appropriate value for this + * field. + * @param Google_Service_Dataproc_GetIamPolicyRequest $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_Dataproc_Policy + */ + public function getIamPolicy($resource, Google_Service_Dataproc_GetIamPolicyRequest $postBody, $optParams = array()) + { + $params = array('resource' => $resource, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('getIamPolicy', array($params), "Google_Service_Dataproc_Policy"); + } + /** + * Lists autoscaling policies in the project. + * (autoscalingPolicies.listProjectsLocationsAutoscalingPolicies) + * + * @param string $parent Required. The "resource name" of the region or + * location, as described in + * https://cloud.google.com/apis/design/resource_names. For + * projects.regions.autoscalingPolicies.list, the resource name of the region + * has the following format: projects/{project_id}/regions/{region} For + * projects.locations.autoscalingPolicies.list, the resource name of the + * location has the following format: + * projects/{project_id}/locations/{location} + * @param array $optParams Optional parameters. + * + * @opt_param string pageToken Optional. The page token, returned by a previous + * call, to request the next page of results. + * @opt_param int pageSize Optional. The maximum number of results to return in + * each response. Must be less than or equal to 1000. Defaults to 100. + * @return Google_Service_Dataproc_ListAutoscalingPoliciesResponse + */ + public function listProjectsLocationsAutoscalingPolicies($parent, $optParams = array()) + { + $params = array('parent' => $parent); + $params = array_merge($params, $optParams); + return $this->call('list', array($params), "Google_Service_Dataproc_ListAutoscalingPoliciesResponse"); + } + /** + * Sets the access control policy on the specified resource. Replaces any + * existing policy. (autoscalingPolicies.setIamPolicy) + * + * @param string $resource REQUIRED: The resource for which the policy is being + * specified. See the operation documentation for the appropriate value for this + * field. + * @param Google_Service_Dataproc_SetIamPolicyRequest $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_Dataproc_Policy + */ + public function setIamPolicy($resource, Google_Service_Dataproc_SetIamPolicyRequest $postBody, $optParams = array()) + { + $params = array('resource' => $resource, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('setIamPolicy', array($params), "Google_Service_Dataproc_Policy"); + } + /** + * Returns permissions that a caller has on the specified resource. If the + * resource does not exist, this will return an empty set of permissions, not a + * NOT_FOUND error.Note: This operation is designed to be used for building + * permission-aware UIs and command-line tools, not for authorization checking. + * This operation may "fail open" without warning. + * (autoscalingPolicies.testIamPermissions) + * + * @param string $resource REQUIRED: The resource for which the policy detail is + * being requested. See the operation documentation for the appropriate value + * for this field. + * @param Google_Service_Dataproc_TestIamPermissionsRequest $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_Dataproc_TestIamPermissionsResponse + */ + public function testIamPermissions($resource, Google_Service_Dataproc_TestIamPermissionsRequest $postBody, $optParams = array()) + { + $params = array('resource' => $resource, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('testIamPermissions', array($params), "Google_Service_Dataproc_TestIamPermissionsResponse"); + } + /** + * Updates (replaces) autoscaling policy.Disabled check for update_mask, because + * all updates will be full replacements. (autoscalingPolicies.update) + * + * @param string $name Output only. The "resource name" of the autoscaling + * policy, as described in https://cloud.google.com/apis/design/resource_names. + * For projects.regions.autoscalingPolicies, the resource name of the policy + * has the following format: + * projects/{project_id}/regions/{region}/autoscalingPolicies/{policy_id} For + * projects.locations.autoscalingPolicies, the resource name of the policy has + * the following format: + * projects/{project_id}/locations/{location}/autoscalingPolicies/{policy_id} + * @param Google_Service_Dataproc_AutoscalingPolicy $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_Dataproc_AutoscalingPolicy + */ + public function update($name, Google_Service_Dataproc_AutoscalingPolicy $postBody, $optParams = array()) + { + $params = array('name' => $name, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('update', array($params), "Google_Service_Dataproc_AutoscalingPolicy"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsLocationsWorkflowTemplates.php b/vendor/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsLocationsWorkflowTemplates.php index c52b0e5..15c893a 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsLocationsWorkflowTemplates.php +++ b/vendor/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsLocationsWorkflowTemplates.php @@ -28,9 +28,13 @@ class Google_Service_Dataproc_Resource_ProjectsLocationsWorkflowTemplates extend /** * Creates new workflow template. (workflowTemplates.create) * - * @param string $parent Required. The "resource name" of the region, as - * described in https://cloud.google.com/apis/design/resource_names of the form - * projects/{project_id}/regions/{region} + * @param string $parent Required. The resource name of the region or location, + * as described in https://cloud.google.com/apis/design/resource_names. For + * projects.regions.workflowTemplates,create, the resource name of the region + * has the following format: projects/{project_id}/regions/{region} For + * projects.locations.workflowTemplates.create, the resource name of the + * location has the following format: + * projects/{project_id}/locations/{location} * @param Google_Service_Dataproc_WorkflowTemplate $postBody * @param array $optParams Optional parameters. * @return Google_Service_Dataproc_WorkflowTemplate @@ -45,9 +49,14 @@ class Google_Service_Dataproc_Resource_ProjectsLocationsWorkflowTemplates extend * Deletes a workflow template. It does not cancel in-progress workflows. * (workflowTemplates.delete) * - * @param string $name Required. The "resource name" of the workflow template, - * as described in https://cloud.google.com/apis/design/resource_names of the - * form projects/{project_id}/regions/{region}/workflowTemplates/{template_id} + * @param string $name Required. The resource name of the workflow template, as + * described in https://cloud.google.com/apis/design/resource_names. For + * projects.regions.workflowTemplates.delete, the resource name of the template + * has the following format: + * projects/{project_id}/regions/{region}/workflowTemplates/{template_id} For + * projects.locations.workflowTemplates.instantiate, the resource name of the + * template has the following format: + * projects/{project_id}/locations/{location}/workflowTemplates/{template_id} * @param array $optParams Optional parameters. * * @opt_param int version Optional. The version of workflow template to delete. @@ -65,13 +74,18 @@ class Google_Service_Dataproc_Resource_ProjectsLocationsWorkflowTemplates extend * Retrieves the latest workflow template.Can retrieve previously instantiated * template by specifying optional version parameter. (workflowTemplates.get) * - * @param string $name Required. The "resource name" of the workflow template, - * as described in https://cloud.google.com/apis/design/resource_names of the - * form projects/{project_id}/regions/{region}/workflowTemplates/{template_id} + * @param string $name Required. The resource name of the workflow template, as + * described in https://cloud.google.com/apis/design/resource_names. For + * projects.regions.workflowTemplates.get, the resource name of the template + * has the following format: + * projects/{project_id}/regions/{region}/workflowTemplates/{template_id} For + * projects.locations.workflowTemplates.get, the resource name of the template + * has the following format: + * projects/{project_id}/locations/{location}/workflowTemplates/{template_id} * @param array $optParams Optional parameters. * * @opt_param int version Optional. The version of workflow template to - * retrieve. Only previously instatiated versions can be retrieved.If + * retrieve. Only previously instantiated versions can be retrieved.If * unspecified, retrieves the current version. * @return Google_Service_Dataproc_WorkflowTemplate */ @@ -108,9 +122,14 @@ class Google_Service_Dataproc_Resource_ProjectsLocationsWorkflowTemplates extend * will be WorkflowMetadata. Also see Using WorkflowMetadata.On successful * completion, Operation.response will be Empty. (workflowTemplates.instantiate) * - * @param string $name Required. The "resource name" of the workflow template, - * as described in https://cloud.google.com/apis/design/resource_names of the - * form projects/{project_id}/regions/{region}/workflowTemplates/{template_id} + * @param string $name Required. The resource name of the workflow template, as + * described in https://cloud.google.com/apis/design/resource_names. For + * projects.regions.workflowTemplates.instantiate, the resource name of the + * template has the following format: + * projects/{project_id}/regions/{region}/workflowTemplates/{template_id} For + * projects.locations.workflowTemplates.instantiate, the resource name of the + * template has the following format: + * projects/{project_id}/locations/{location}/workflowTemplates/{template_id} * @param Google_Service_Dataproc_InstantiateWorkflowTemplateRequest $postBody * @param array $optParams Optional parameters. * @return Google_Service_Dataproc_Operation @@ -132,9 +151,13 @@ class Google_Service_Dataproc_Resource_ProjectsLocationsWorkflowTemplates extend * WorkflowMetadata. Also see Using WorkflowMetadata.On successful completion, * Operation.response will be Empty. (workflowTemplates.instantiateInline) * - * @param string $parent Required. The "resource name" of the workflow template - * region, as described in https://cloud.google.com/apis/design/resource_names - * of the form projects/{project_id}/regions/{region} + * @param string $parent Required. The resource name of the region or location, + * as described in https://cloud.google.com/apis/design/resource_names. For + * projects.regions.workflowTemplates,instantiateinline, the resource name of + * the region has the following format: projects/{project_id}/regions/{region} + * For projects.locations.workflowTemplates.instantiateinline, the resource + * name of the location has the following format: + * projects/{project_id}/locations/{location} * @param Google_Service_Dataproc_WorkflowTemplate $postBody * @param array $optParams Optional parameters. * @@ -157,9 +180,12 @@ class Google_Service_Dataproc_Resource_ProjectsLocationsWorkflowTemplates extend * Lists workflows that match the specified filter in the request. * (workflowTemplates.listProjectsLocationsWorkflowTemplates) * - * @param string $parent Required. The "resource name" of the region, as - * described in https://cloud.google.com/apis/design/resource_names of the form - * projects/{project_id}/regions/{region} + * @param string $parent Required. The resource name of the region or location, + * as described in https://cloud.google.com/apis/design/resource_names. For + * projects.regions.workflowTemplates,list, the resource name of the region has + * the following format: projects/{project_id}/regions/{region} For + * projects.locations.workflowTemplates.list, the resource name of the location + * has the following format: projects/{project_id}/locations/{location} * @param array $optParams Optional parameters. * * @opt_param string pageToken Optional. The page token, returned by a previous @@ -216,9 +242,14 @@ class Google_Service_Dataproc_Resource_ProjectsLocationsWorkflowTemplates extend * Updates (replaces) workflow template. The updated template must contain * version that matches the current server version. (workflowTemplates.update) * - * @param string $name Output only. The "resource name" of the template, as - * described in https://cloud.google.com/apis/design/resource_names of the form - * projects/{project_id}/regions/{region}/workflowTemplates/{template_id} + * @param string $name Output only. The resource name of the workflow template, + * as described in https://cloud.google.com/apis/design/resource_names. For + * projects.regions.workflowTemplates, the resource name of the template has + * the following format: + * projects/{project_id}/regions/{region}/workflowTemplates/{template_id} For + * projects.locations.workflowTemplates, the resource name of the template has + * the following format: + * projects/{project_id}/locations/{location}/workflowTemplates/{template_id} * @param Google_Service_Dataproc_WorkflowTemplate $postBody * @param array $optParams Optional parameters. * @return Google_Service_Dataproc_WorkflowTemplate diff --git a/vendor/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsRegionsAutoscalingPolicies.php b/vendor/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsRegionsAutoscalingPolicies.php new file mode 100644 index 0000000..c0f79e9 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsRegionsAutoscalingPolicies.php @@ -0,0 +1,194 @@ + + * $dataprocService = new Google_Service_Dataproc(...); + * $autoscalingPolicies = $dataprocService->autoscalingPolicies; + * + */ +class Google_Service_Dataproc_Resource_ProjectsRegionsAutoscalingPolicies extends Google_Service_Resource +{ + /** + * Creates new autoscaling policy. (autoscalingPolicies.create) + * + * @param string $parent Required. The "resource name" of the region or + * location, as described in + * https://cloud.google.com/apis/design/resource_names. For + * projects.regions.autoscalingPolicies.create, the resource name of the region + * has the following format: projects/{project_id}/regions/{region} For + * projects.locations.autoscalingPolicies.create, the resource name of the + * location has the following format: + * projects/{project_id}/locations/{location} + * @param Google_Service_Dataproc_AutoscalingPolicy $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_Dataproc_AutoscalingPolicy + */ + public function create($parent, Google_Service_Dataproc_AutoscalingPolicy $postBody, $optParams = array()) + { + $params = array('parent' => $parent, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('create', array($params), "Google_Service_Dataproc_AutoscalingPolicy"); + } + /** + * Deletes an autoscaling policy. It is an error to delete an autoscaling policy + * that is in use by one or more clusters. (autoscalingPolicies.delete) + * + * @param string $name Required. The "resource name" of the autoscaling policy, + * as described in https://cloud.google.com/apis/design/resource_names. For + * projects.regions.autoscalingPolicies.delete, the resource name of the policy + * has the following format: + * projects/{project_id}/regions/{region}/autoscalingPolicies/{policy_id} For + * projects.locations.autoscalingPolicies.delete, the resource name of the + * policy has the following format: + * projects/{project_id}/locations/{location}/autoscalingPolicies/{policy_id} + * @param array $optParams Optional parameters. + * @return Google_Service_Dataproc_DataprocEmpty + */ + public function delete($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('delete', array($params), "Google_Service_Dataproc_DataprocEmpty"); + } + /** + * Retrieves autoscaling policy. (autoscalingPolicies.get) + * + * @param string $name Required. The "resource name" of the autoscaling policy, + * as described in https://cloud.google.com/apis/design/resource_names. For + * projects.regions.autoscalingPolicies.get, the resource name of the policy + * has the following format: + * projects/{project_id}/regions/{region}/autoscalingPolicies/{policy_id} For + * projects.locations.autoscalingPolicies.get, the resource name of the policy + * has the following format: + * projects/{project_id}/locations/{location}/autoscalingPolicies/{policy_id} + * @param array $optParams Optional parameters. + * @return Google_Service_Dataproc_AutoscalingPolicy + */ + public function get($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('get', array($params), "Google_Service_Dataproc_AutoscalingPolicy"); + } + /** + * Gets the access control policy for a resource. Returns an empty policy if the + * resource exists and does not have a policy set. + * (autoscalingPolicies.getIamPolicy) + * + * @param string $resource REQUIRED: The resource for which the policy is being + * requested. See the operation documentation for the appropriate value for this + * field. + * @param Google_Service_Dataproc_GetIamPolicyRequest $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_Dataproc_Policy + */ + public function getIamPolicy($resource, Google_Service_Dataproc_GetIamPolicyRequest $postBody, $optParams = array()) + { + $params = array('resource' => $resource, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('getIamPolicy', array($params), "Google_Service_Dataproc_Policy"); + } + /** + * Lists autoscaling policies in the project. + * (autoscalingPolicies.listProjectsRegionsAutoscalingPolicies) + * + * @param string $parent Required. The "resource name" of the region or + * location, as described in + * https://cloud.google.com/apis/design/resource_names. For + * projects.regions.autoscalingPolicies.list, the resource name of the region + * has the following format: projects/{project_id}/regions/{region} For + * projects.locations.autoscalingPolicies.list, the resource name of the + * location has the following format: + * projects/{project_id}/locations/{location} + * @param array $optParams Optional parameters. + * + * @opt_param string pageToken Optional. The page token, returned by a previous + * call, to request the next page of results. + * @opt_param int pageSize Optional. The maximum number of results to return in + * each response. Must be less than or equal to 1000. Defaults to 100. + * @return Google_Service_Dataproc_ListAutoscalingPoliciesResponse + */ + public function listProjectsRegionsAutoscalingPolicies($parent, $optParams = array()) + { + $params = array('parent' => $parent); + $params = array_merge($params, $optParams); + return $this->call('list', array($params), "Google_Service_Dataproc_ListAutoscalingPoliciesResponse"); + } + /** + * Sets the access control policy on the specified resource. Replaces any + * existing policy. (autoscalingPolicies.setIamPolicy) + * + * @param string $resource REQUIRED: The resource for which the policy is being + * specified. See the operation documentation for the appropriate value for this + * field. + * @param Google_Service_Dataproc_SetIamPolicyRequest $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_Dataproc_Policy + */ + public function setIamPolicy($resource, Google_Service_Dataproc_SetIamPolicyRequest $postBody, $optParams = array()) + { + $params = array('resource' => $resource, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('setIamPolicy', array($params), "Google_Service_Dataproc_Policy"); + } + /** + * Returns permissions that a caller has on the specified resource. If the + * resource does not exist, this will return an empty set of permissions, not a + * NOT_FOUND error.Note: This operation is designed to be used for building + * permission-aware UIs and command-line tools, not for authorization checking. + * This operation may "fail open" without warning. + * (autoscalingPolicies.testIamPermissions) + * + * @param string $resource REQUIRED: The resource for which the policy detail is + * being requested. See the operation documentation for the appropriate value + * for this field. + * @param Google_Service_Dataproc_TestIamPermissionsRequest $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_Dataproc_TestIamPermissionsResponse + */ + public function testIamPermissions($resource, Google_Service_Dataproc_TestIamPermissionsRequest $postBody, $optParams = array()) + { + $params = array('resource' => $resource, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('testIamPermissions', array($params), "Google_Service_Dataproc_TestIamPermissionsResponse"); + } + /** + * Updates (replaces) autoscaling policy.Disabled check for update_mask, because + * all updates will be full replacements. (autoscalingPolicies.update) + * + * @param string $name Output only. The "resource name" of the autoscaling + * policy, as described in https://cloud.google.com/apis/design/resource_names. + * For projects.regions.autoscalingPolicies, the resource name of the policy + * has the following format: + * projects/{project_id}/regions/{region}/autoscalingPolicies/{policy_id} For + * projects.locations.autoscalingPolicies, the resource name of the policy has + * the following format: + * projects/{project_id}/locations/{location}/autoscalingPolicies/{policy_id} + * @param Google_Service_Dataproc_AutoscalingPolicy $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_Dataproc_AutoscalingPolicy + */ + public function update($name, Google_Service_Dataproc_AutoscalingPolicy $postBody, $optParams = array()) + { + $params = array('name' => $name, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('update', array($params), "Google_Service_Dataproc_AutoscalingPolicy"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsRegionsClusters.php b/vendor/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsRegionsClusters.php index 19e32f2..8d0e657 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsRegionsClusters.php +++ b/vendor/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsRegionsClusters.php @@ -26,7 +26,8 @@ class Google_Service_Dataproc_Resource_ProjectsRegionsClusters extends Google_Service_Resource { /** - * Creates a cluster in a project. (clusters.create) + * Creates a cluster in a project. The returned Operation.metadata will be + * ClusterOperationMetadata. (clusters.create) * * @param string $projectId Required. The ID of the Google Cloud Platform * project that the cluster belongs to. @@ -52,7 +53,8 @@ class Google_Service_Dataproc_Resource_ProjectsRegionsClusters extends Google_Se return $this->call('create', array($params), "Google_Service_Dataproc_Operation"); } /** - * Deletes a cluster in a project. (clusters.delete) + * Deletes a cluster in a project. The returned Operation.metadata will be + * ClusterOperationMetadata. (clusters.delete) * * @param string $projectId Required. The ID of the Google Cloud Platform * project that the cluster belongs to. @@ -61,6 +63,9 @@ class Google_Service_Dataproc_Resource_ProjectsRegionsClusters extends Google_Se * @param string $clusterName Required. The cluster name. * @param array $optParams Optional parameters. * + * @opt_param string clusterUuid Optional. Specifying the cluster_uuid means the + * RPC should fail (with error NOT_FOUND) if cluster with specified UUID does + * not exist. * @opt_param string requestId Optional. A unique id used to identify the * request. If the server receives two DeleteClusterRequest requests with the * same id, then the second request will be ignored and the first @@ -69,9 +74,6 @@ class Google_Service_Dataproc_Resource_ProjectsRegionsClusters extends Google_Se * (https://en.wikipedia.org/wiki/Universally_unique_identifier).The id must * contain only letters (a-z, A-Z), numbers (0-9), underscores (_), and hyphens * (-). The maximum length is 40 characters. - * @opt_param string clusterUuid Optional. Specifying the cluster_uuid means the - * RPC should fail (with error NOT_FOUND) if cluster with specified UUID does - * not exist. * @return Google_Service_Dataproc_Operation */ public function delete($projectId, $region, $clusterName, $optParams = array()) @@ -81,9 +83,9 @@ class Google_Service_Dataproc_Resource_ProjectsRegionsClusters extends Google_Se return $this->call('delete', array($params), "Google_Service_Dataproc_Operation"); } /** - * Gets cluster diagnostic information. After the operation completes, the - * Operation.response field contains DiagnoseClusterOutputLocation. - * (clusters.diagnose) + * Gets cluster diagnostic information. The returned Operation.metadata will be + * ClusterOperationMetadata. After the operation completes, Operation.response + * contains DiagnoseClusterResults. (clusters.diagnose) * * @param string $projectId Required. The ID of the Google Cloud Platform * project that the cluster belongs to. @@ -144,6 +146,8 @@ class Google_Service_Dataproc_Resource_ProjectsRegionsClusters extends Google_Se * the request. * @param array $optParams Optional parameters. * + * @opt_param string pageToken Optional. The standard List page token. + * @opt_param int pageSize Optional. The standard List page size. * @opt_param string filter Optional. A filter constraining the clusters to * list. Filters are case-sensitive and have the following syntax:field = value * AND field = value ...where field is one of status.state, clusterName, or @@ -155,8 +159,6 @@ class Google_Service_Dataproc_Resource_ProjectsRegionsClusters extends Google_Se * Only the logical AND operator is supported; space-separated items are treated * as having an implicit AND operator.Example filter:status.state = ACTIVE AND * clusterName = mycluster AND labels.env = staging AND labels.starred = * - * @opt_param string pageToken Optional. The standard List page token. - * @opt_param int pageSize Optional. The standard List page size. * @return Google_Service_Dataproc_ListClustersResponse */ public function listProjectsRegionsClusters($projectId, $region, $optParams = array()) @@ -166,7 +168,8 @@ class Google_Service_Dataproc_Resource_ProjectsRegionsClusters extends Google_Se return $this->call('list', array($params), "Google_Service_Dataproc_ListClustersResponse"); } /** - * Updates a cluster in a project. (clusters.patch) + * Updates a cluster in a project. The returned Operation.metadata will be + * ClusterOperationMetadata. (clusters.patch) * * @param string $projectId Required. The ID of the Google Cloud Platform * project the cluster belongs to. @@ -204,6 +207,8 @@ class Google_Service_Dataproc_Resource_ProjectsRegionsClusters extends Google_Se * be updated: Mask Purpose labels Update labels * config.worker_config.num_instances Resize primary worker group * config.secondary_worker_config.num_instances Resize secondary worker group + * config.autoscaling_config.policy_uriUse, stop using, or change autoscaling + * policies * @return Google_Service_Dataproc_Operation */ public function patch($projectId, $region, $clusterName, Google_Service_Dataproc_Cluster $postBody, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsRegionsJobs.php b/vendor/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsRegionsJobs.php index 292b36b..3fae1ff 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsRegionsJobs.php +++ b/vendor/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsRegionsJobs.php @@ -106,13 +106,6 @@ class Google_Service_Dataproc_Resource_ProjectsRegionsJobs extends Google_Servic * the request. * @param array $optParams Optional parameters. * - * @opt_param string jobStateMatcher Optional. Specifies enumerated categories - * of jobs to list. (default = match ALL jobs).If filter is provided, - * jobStateMatcher will be ignored. - * @opt_param string pageToken Optional. The page token, returned by a previous - * call, to request the next page of results. - * @opt_param int pageSize Optional. The number of results to return in each - * response. * @opt_param string clusterName Optional. If set, the returned jobs list * includes only jobs that were submitted to the named cluster. * @opt_param string filter Optional. A filter constraining the jobs to list. @@ -122,6 +115,13 @@ class Google_Service_Dataproc_Resource_ProjectsRegionsJobs extends Google_Servic * ACTIVE or NON_ACTIVE. Only the logical AND operator is supported; space- * separated items are treated as having an implicit AND operator.Example * filter:status.state = ACTIVE AND labels.env = staging AND labels.starred = * + * @opt_param string jobStateMatcher Optional. Specifies enumerated categories + * of jobs to list. (default = match ALL jobs).If filter is provided, + * jobStateMatcher will be ignored. + * @opt_param string pageToken Optional. The page token, returned by a previous + * call, to request the next page of results. + * @opt_param int pageSize Optional. The number of results to return in each + * response. * @return Google_Service_Dataproc_ListJobsResponse */ public function listProjectsRegionsJobs($projectId, $region, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsRegionsWorkflowTemplates.php b/vendor/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsRegionsWorkflowTemplates.php index 6215d23..e0fbe60 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsRegionsWorkflowTemplates.php +++ b/vendor/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsRegionsWorkflowTemplates.php @@ -28,9 +28,13 @@ class Google_Service_Dataproc_Resource_ProjectsRegionsWorkflowTemplates extends /** * Creates new workflow template. (workflowTemplates.create) * - * @param string $parent Required. The "resource name" of the region, as - * described in https://cloud.google.com/apis/design/resource_names of the form - * projects/{project_id}/regions/{region} + * @param string $parent Required. The resource name of the region or location, + * as described in https://cloud.google.com/apis/design/resource_names. For + * projects.regions.workflowTemplates,create, the resource name of the region + * has the following format: projects/{project_id}/regions/{region} For + * projects.locations.workflowTemplates.create, the resource name of the + * location has the following format: + * projects/{project_id}/locations/{location} * @param Google_Service_Dataproc_WorkflowTemplate $postBody * @param array $optParams Optional parameters. * @return Google_Service_Dataproc_WorkflowTemplate @@ -45,9 +49,14 @@ class Google_Service_Dataproc_Resource_ProjectsRegionsWorkflowTemplates extends * Deletes a workflow template. It does not cancel in-progress workflows. * (workflowTemplates.delete) * - * @param string $name Required. The "resource name" of the workflow template, - * as described in https://cloud.google.com/apis/design/resource_names of the - * form projects/{project_id}/regions/{region}/workflowTemplates/{template_id} + * @param string $name Required. The resource name of the workflow template, as + * described in https://cloud.google.com/apis/design/resource_names. For + * projects.regions.workflowTemplates.delete, the resource name of the template + * has the following format: + * projects/{project_id}/regions/{region}/workflowTemplates/{template_id} For + * projects.locations.workflowTemplates.instantiate, the resource name of the + * template has the following format: + * projects/{project_id}/locations/{location}/workflowTemplates/{template_id} * @param array $optParams Optional parameters. * * @opt_param int version Optional. The version of workflow template to delete. @@ -65,13 +74,18 @@ class Google_Service_Dataproc_Resource_ProjectsRegionsWorkflowTemplates extends * Retrieves the latest workflow template.Can retrieve previously instantiated * template by specifying optional version parameter. (workflowTemplates.get) * - * @param string $name Required. The "resource name" of the workflow template, - * as described in https://cloud.google.com/apis/design/resource_names of the - * form projects/{project_id}/regions/{region}/workflowTemplates/{template_id} + * @param string $name Required. The resource name of the workflow template, as + * described in https://cloud.google.com/apis/design/resource_names. For + * projects.regions.workflowTemplates.get, the resource name of the template + * has the following format: + * projects/{project_id}/regions/{region}/workflowTemplates/{template_id} For + * projects.locations.workflowTemplates.get, the resource name of the template + * has the following format: + * projects/{project_id}/locations/{location}/workflowTemplates/{template_id} * @param array $optParams Optional parameters. * * @opt_param int version Optional. The version of workflow template to - * retrieve. Only previously instatiated versions can be retrieved.If + * retrieve. Only previously instantiated versions can be retrieved.If * unspecified, retrieves the current version. * @return Google_Service_Dataproc_WorkflowTemplate */ @@ -108,9 +122,14 @@ class Google_Service_Dataproc_Resource_ProjectsRegionsWorkflowTemplates extends * will be WorkflowMetadata. Also see Using WorkflowMetadata.On successful * completion, Operation.response will be Empty. (workflowTemplates.instantiate) * - * @param string $name Required. The "resource name" of the workflow template, - * as described in https://cloud.google.com/apis/design/resource_names of the - * form projects/{project_id}/regions/{region}/workflowTemplates/{template_id} + * @param string $name Required. The resource name of the workflow template, as + * described in https://cloud.google.com/apis/design/resource_names. For + * projects.regions.workflowTemplates.instantiate, the resource name of the + * template has the following format: + * projects/{project_id}/regions/{region}/workflowTemplates/{template_id} For + * projects.locations.workflowTemplates.instantiate, the resource name of the + * template has the following format: + * projects/{project_id}/locations/{location}/workflowTemplates/{template_id} * @param Google_Service_Dataproc_InstantiateWorkflowTemplateRequest $postBody * @param array $optParams Optional parameters. * @return Google_Service_Dataproc_Operation @@ -132,9 +151,13 @@ class Google_Service_Dataproc_Resource_ProjectsRegionsWorkflowTemplates extends * WorkflowMetadata. Also see Using WorkflowMetadata.On successful completion, * Operation.response will be Empty. (workflowTemplates.instantiateInline) * - * @param string $parent Required. The "resource name" of the workflow template - * region, as described in https://cloud.google.com/apis/design/resource_names - * of the form projects/{project_id}/regions/{region} + * @param string $parent Required. The resource name of the region or location, + * as described in https://cloud.google.com/apis/design/resource_names. For + * projects.regions.workflowTemplates,instantiateinline, the resource name of + * the region has the following format: projects/{project_id}/regions/{region} + * For projects.locations.workflowTemplates.instantiateinline, the resource + * name of the location has the following format: + * projects/{project_id}/locations/{location} * @param Google_Service_Dataproc_WorkflowTemplate $postBody * @param array $optParams Optional parameters. * @@ -157,9 +180,12 @@ class Google_Service_Dataproc_Resource_ProjectsRegionsWorkflowTemplates extends * Lists workflows that match the specified filter in the request. * (workflowTemplates.listProjectsRegionsWorkflowTemplates) * - * @param string $parent Required. The "resource name" of the region, as - * described in https://cloud.google.com/apis/design/resource_names of the form - * projects/{project_id}/regions/{region} + * @param string $parent Required. The resource name of the region or location, + * as described in https://cloud.google.com/apis/design/resource_names. For + * projects.regions.workflowTemplates,list, the resource name of the region has + * the following format: projects/{project_id}/regions/{region} For + * projects.locations.workflowTemplates.list, the resource name of the location + * has the following format: projects/{project_id}/locations/{location} * @param array $optParams Optional parameters. * * @opt_param string pageToken Optional. The page token, returned by a previous @@ -216,9 +242,14 @@ class Google_Service_Dataproc_Resource_ProjectsRegionsWorkflowTemplates extends * Updates (replaces) workflow template. The updated template must contain * version that matches the current server version. (workflowTemplates.update) * - * @param string $name Output only. The "resource name" of the template, as - * described in https://cloud.google.com/apis/design/resource_names of the form - * projects/{project_id}/regions/{region}/workflowTemplates/{template_id} + * @param string $name Output only. The resource name of the workflow template, + * as described in https://cloud.google.com/apis/design/resource_names. For + * projects.regions.workflowTemplates, the resource name of the template has + * the following format: + * projects/{project_id}/regions/{region}/workflowTemplates/{template_id} For + * projects.locations.workflowTemplates, the resource name of the template has + * the following format: + * projects/{project_id}/locations/{location}/workflowTemplates/{template_id} * @param Google_Service_Dataproc_WorkflowTemplate $postBody * @param array $optParams Optional parameters. * @return Google_Service_Dataproc_WorkflowTemplate diff --git a/vendor/google/apiclient-services/src/Google/Service/Datastore.php b/vendor/google/apiclient-services/src/Google/Service/Datastore.php index 2277b44..ea81198 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Datastore.php +++ b/vendor/google/apiclient-services/src/Google/Service/Datastore.php @@ -187,6 +187,10 @@ class Google_Service_Datastore extends Google_Service 'type' => 'string', 'required' => true, ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), 'pageSize' => array( 'location' => 'query', 'type' => 'integer', @@ -195,10 +199,6 @@ class Google_Service_Datastore extends Google_Service 'location' => 'query', 'type' => 'string', ), - 'pageToken' => array( - 'location' => 'query', - 'type' => 'string', - ), ), ), ) @@ -249,10 +249,6 @@ class Google_Service_Datastore extends Google_Service 'type' => 'string', 'required' => true, ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -261,6 +257,10 @@ class Google_Service_Datastore extends Google_Service 'location' => 'query', 'type' => 'integer', ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ), ) diff --git a/vendor/google/apiclient-services/src/Google/Service/Datastore/Resource/ProjectsIndexes.php b/vendor/google/apiclient-services/src/Google/Service/Datastore/Resource/ProjectsIndexes.php index 3e9a12c..a2df513 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Datastore/Resource/ProjectsIndexes.php +++ b/vendor/google/apiclient-services/src/Google/Service/Datastore/Resource/ProjectsIndexes.php @@ -47,11 +47,11 @@ class Google_Service_Datastore_Resource_ProjectsIndexes extends Google_Service_R * @param string $projectId Project ID against which to make the request. * @param array $optParams Optional parameters. * + * @opt_param string pageToken The next_page_token value returned from a + * previous List request, if any. * @opt_param int pageSize The maximum number of items to return. If zero, then * all results will be returned. * @opt_param string filter - * @opt_param string pageToken The next_page_token value returned from a - * previous List request, if any. * @return Google_Service_Datastore_GoogleDatastoreAdminV1ListIndexesResponse */ public function listProjectsIndexes($projectId, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Datastore/Resource/ProjectsOperations.php b/vendor/google/apiclient-services/src/Google/Service/Datastore/Resource/ProjectsOperations.php index 76f3546..65e97cf 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Datastore/Resource/ProjectsOperations.php +++ b/vendor/google/apiclient-services/src/Google/Service/Datastore/Resource/ProjectsOperations.php @@ -92,9 +92,9 @@ class Google_Service_Datastore_Resource_ProjectsOperations extends Google_Servic * @param string $name The name of the operation's parent resource. * @param array $optParams Optional parameters. * - * @opt_param string filter The standard list filter. * @opt_param string pageToken The standard list page token. * @opt_param int pageSize The standard list page size. + * @opt_param string filter The standard list filter. * @return Google_Service_Datastore_GoogleLongrunningListOperationsResponse */ public function listProjectsOperations($name, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Dialogflow.php b/vendor/google/apiclient-services/src/Google/Service/Dialogflow.php index 3635134..b7f78a4 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dialogflow.php +++ b/vendor/google/apiclient-services/src/Google/Service/Dialogflow.php @@ -46,6 +46,7 @@ class Google_Service_Dialogflow extends Google_Service public $projects_agent_sessions; public $projects_agent_sessions_contexts; public $projects_agent_sessions_entityTypes; + public $projects_locations_operations; public $projects_operations; /** @@ -248,10 +249,6 @@ class Google_Service_Dialogflow extends Google_Service 'type' => 'string', 'required' => true, ), - 'languageCode' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -260,6 +257,10 @@ class Google_Service_Dialogflow extends Google_Service 'location' => 'query', 'type' => 'integer', ), + 'languageCode' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'patch' => array( 'path' => 'v2/{+name}', @@ -386,11 +387,11 @@ class Google_Service_Dialogflow extends Google_Service 'type' => 'string', 'required' => true, ), - 'intentView' => array( + 'languageCode' => array( 'location' => 'query', 'type' => 'string', ), - 'languageCode' => array( + 'intentView' => array( 'location' => 'query', 'type' => 'string', ), @@ -404,14 +405,6 @@ class Google_Service_Dialogflow extends Google_Service 'type' => 'string', 'required' => true, ), - 'languageCode' => array( - 'location' => 'query', - 'type' => 'string', - ), - 'pageToken' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageSize' => array( 'location' => 'query', 'type' => 'integer', @@ -420,6 +413,14 @@ class Google_Service_Dialogflow extends Google_Service 'location' => 'query', 'type' => 'string', ), + 'languageCode' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'patch' => array( 'path' => 'v2/{+name}', @@ -430,10 +431,6 @@ class Google_Service_Dialogflow extends Google_Service 'type' => 'string', 'required' => true, ), - 'intentView' => array( - 'location' => 'query', - 'type' => 'string', - ), 'languageCode' => array( 'location' => 'query', 'type' => 'string', @@ -442,6 +439,10 @@ class Google_Service_Dialogflow extends Google_Service 'location' => 'query', 'type' => 'string', ), + 'intentView' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ), ) @@ -522,14 +523,14 @@ class Google_Service_Dialogflow extends Google_Service 'type' => 'string', 'required' => true, ), - 'pageToken' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageSize' => array( 'location' => 'query', 'type' => 'integer', ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'patch' => array( 'path' => 'v2/{+name}', @@ -621,13 +622,75 @@ class Google_Service_Dialogflow extends Google_Service ) ) ); + $this->projects_locations_operations = new Google_Service_Dialogflow_Resource_ProjectsLocationsOperations( + $this, + $this->serviceName, + 'operations', + array( + 'methods' => array( + 'cancel' => array( + 'path' => 'v2/{+name}:cancel', + 'httpMethod' => 'POST', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'get' => array( + 'path' => 'v2/{+name}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'list' => array( + 'path' => 'v2/{+name}/operations', + 'httpMethod' => 'GET', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'pageSize' => array( + 'location' => 'query', + 'type' => 'integer', + ), + ), + ), + ) + ) + ); $this->projects_operations = new Google_Service_Dialogflow_Resource_ProjectsOperations( $this, $this->serviceName, 'operations', array( 'methods' => array( - 'get' => array( + 'cancel' => array( + 'path' => 'v2/{+name}:cancel', + 'httpMethod' => 'POST', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'get' => array( 'path' => 'v2/{+name}', 'httpMethod' => 'GET', 'parameters' => array( diff --git a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2ArticleAnswer.php b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2ArticleAnswer.php new file mode 100644 index 0000000..bed5bed --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2ArticleAnswer.php @@ -0,0 +1,76 @@ +answerRecord = $answerRecord; + } + public function getAnswerRecord() + { + return $this->answerRecord; + } + public function setConfidence($confidence) + { + $this->confidence = $confidence; + } + public function getConfidence() + { + return $this->confidence; + } + public function setMetadata($metadata) + { + $this->metadata = $metadata; + } + public function getMetadata() + { + return $this->metadata; + } + public function setSnippets($snippets) + { + $this->snippets = $snippets; + } + public function getSnippets() + { + return $this->snippets; + } + public function setTitle($title) + { + $this->title = $title; + } + public function getTitle() + { + return $this->title; + } + public function setUri($uri) + { + $this->uri = $uri; + } + public function getUri() + { + return $this->uri; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2EntityType.php b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2EntityType.php index 6a6bbad..d81953a 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2EntityType.php +++ b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2EntityType.php @@ -20,6 +20,7 @@ class Google_Service_Dialogflow_GoogleCloudDialogflowV2EntityType extends Google protected $collection_key = 'entities'; public $autoExpansionMode; public $displayName; + public $enableFuzzyExtraction; protected $entitiesType = 'Google_Service_Dialogflow_GoogleCloudDialogflowV2EntityTypeEntity'; protected $entitiesDataType = 'array'; public $kind; @@ -41,6 +42,14 @@ class Google_Service_Dialogflow_GoogleCloudDialogflowV2EntityType extends Google { return $this->displayName; } + public function setEnableFuzzyExtraction($enableFuzzyExtraction) + { + $this->enableFuzzyExtraction = $enableFuzzyExtraction; + } + public function getEnableFuzzyExtraction() + { + return $this->enableFuzzyExtraction; + } /** * @param Google_Service_Dialogflow_GoogleCloudDialogflowV2EntityTypeEntity */ diff --git a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2FaqAnswer.php b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2FaqAnswer.php new file mode 100644 index 0000000..e447615 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2FaqAnswer.php @@ -0,0 +1,75 @@ +answer = $answer; + } + public function getAnswer() + { + return $this->answer; + } + public function setAnswerRecord($answerRecord) + { + $this->answerRecord = $answerRecord; + } + public function getAnswerRecord() + { + return $this->answerRecord; + } + public function setConfidence($confidence) + { + $this->confidence = $confidence; + } + public function getConfidence() + { + return $this->confidence; + } + public function setMetadata($metadata) + { + $this->metadata = $metadata; + } + public function getMetadata() + { + return $this->metadata; + } + public function setQuestion($question) + { + $this->question = $question; + } + public function getQuestion() + { + return $this->question; + } + public function setSource($source) + { + $this->source = $source; + } + public function getSource() + { + return $this->source; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2HumanAgentAssistantEvent.php b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2HumanAgentAssistantEvent.php new file mode 100644 index 0000000..e5898d4 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2HumanAgentAssistantEvent.php @@ -0,0 +1,56 @@ +conversation = $conversation; + } + public function getConversation() + { + return $this->conversation; + } + public function setParticipant($participant) + { + $this->participant = $participant; + } + public function getParticipant() + { + return $this->participant; + } + /** + * @param Google_Service_Dialogflow_GoogleCloudDialogflowV2SuggestionResult + */ + public function setSuggestionResults($suggestionResults) + { + $this->suggestionResults = $suggestionResults; + } + /** + * @return Google_Service_Dialogflow_GoogleCloudDialogflowV2SuggestionResult + */ + public function getSuggestionResults() + { + return $this->suggestionResults; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2KnowledgeOperationMetadata.php b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2KnowledgeOperationMetadata.php new file mode 100644 index 0000000..319d53a --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2KnowledgeOperationMetadata.php @@ -0,0 +1,30 @@ +state = $state; + } + public function getState() + { + return $this->state; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2SuggestArticlesResponse.php b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2SuggestArticlesResponse.php new file mode 100644 index 0000000..71f4b37 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2SuggestArticlesResponse.php @@ -0,0 +1,56 @@ +articleAnswers = $articleAnswers; + } + /** + * @return Google_Service_Dialogflow_GoogleCloudDialogflowV2ArticleAnswer + */ + public function getArticleAnswers() + { + return $this->articleAnswers; + } + public function setContextSize($contextSize) + { + $this->contextSize = $contextSize; + } + public function getContextSize() + { + return $this->contextSize; + } + public function setLatestMessage($latestMessage) + { + $this->latestMessage = $latestMessage; + } + public function getLatestMessage() + { + return $this->latestMessage; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2SuggestFaqAnswersResponse.php b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2SuggestFaqAnswersResponse.php new file mode 100644 index 0000000..351d504 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2SuggestFaqAnswersResponse.php @@ -0,0 +1,56 @@ +contextSize = $contextSize; + } + public function getContextSize() + { + return $this->contextSize; + } + /** + * @param Google_Service_Dialogflow_GoogleCloudDialogflowV2FaqAnswer + */ + public function setFaqAnswers($faqAnswers) + { + $this->faqAnswers = $faqAnswers; + } + /** + * @return Google_Service_Dialogflow_GoogleCloudDialogflowV2FaqAnswer + */ + public function getFaqAnswers() + { + return $this->faqAnswers; + } + public function setLatestMessage($latestMessage) + { + $this->latestMessage = $latestMessage; + } + public function getLatestMessage() + { + return $this->latestMessage; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2SuggestionResult.php b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2SuggestionResult.php new file mode 100644 index 0000000..4f4b2ae --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2SuggestionResult.php @@ -0,0 +1,69 @@ +error = $error; + } + /** + * @return Google_Service_Dialogflow_GoogleRpcStatus + */ + public function getError() + { + return $this->error; + } + /** + * @param Google_Service_Dialogflow_GoogleCloudDialogflowV2SuggestArticlesResponse + */ + public function setSuggestArticlesResponse(Google_Service_Dialogflow_GoogleCloudDialogflowV2SuggestArticlesResponse $suggestArticlesResponse) + { + $this->suggestArticlesResponse = $suggestArticlesResponse; + } + /** + * @return Google_Service_Dialogflow_GoogleCloudDialogflowV2SuggestArticlesResponse + */ + public function getSuggestArticlesResponse() + { + return $this->suggestArticlesResponse; + } + /** + * @param Google_Service_Dialogflow_GoogleCloudDialogflowV2SuggestFaqAnswersResponse + */ + public function setSuggestFaqAnswersResponse(Google_Service_Dialogflow_GoogleCloudDialogflowV2SuggestFaqAnswersResponse $suggestFaqAnswersResponse) + { + $this->suggestFaqAnswersResponse = $suggestFaqAnswersResponse; + } + /** + * @return Google_Service_Dialogflow_GoogleCloudDialogflowV2SuggestFaqAnswersResponse + */ + public function getSuggestFaqAnswersResponse() + { + return $this->suggestFaqAnswersResponse; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2WebhookResponse.php b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2WebhookResponse.php index c617fbc..e134214 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2WebhookResponse.php +++ b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2WebhookResponse.php @@ -17,7 +17,7 @@ class Google_Service_Dialogflow_GoogleCloudDialogflowV2WebhookResponse extends Google_Collection { - protected $collection_key = 'outputContexts'; + protected $collection_key = 'sessionEntityTypes'; protected $followupEventInputType = 'Google_Service_Dialogflow_GoogleCloudDialogflowV2EventInput'; protected $followupEventInputDataType = ''; protected $fulfillmentMessagesType = 'Google_Service_Dialogflow_GoogleCloudDialogflowV2IntentMessage'; @@ -26,6 +26,8 @@ class Google_Service_Dialogflow_GoogleCloudDialogflowV2WebhookResponse extends G protected $outputContextsType = 'Google_Service_Dialogflow_GoogleCloudDialogflowV2Context'; protected $outputContextsDataType = 'array'; public $payload; + protected $sessionEntityTypesType = 'Google_Service_Dialogflow_GoogleCloudDialogflowV2SessionEntityType'; + protected $sessionEntityTypesDataType = 'array'; public $source; /** @@ -86,6 +88,20 @@ class Google_Service_Dialogflow_GoogleCloudDialogflowV2WebhookResponse extends G { return $this->payload; } + /** + * @param Google_Service_Dialogflow_GoogleCloudDialogflowV2SessionEntityType + */ + public function setSessionEntityTypes($sessionEntityTypes) + { + $this->sessionEntityTypes = $sessionEntityTypes; + } + /** + * @return Google_Service_Dialogflow_GoogleCloudDialogflowV2SessionEntityType + */ + public function getSessionEntityTypes() + { + return $this->sessionEntityTypes; + } public function setSource($source) { $this->source = $source; diff --git a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1ArticleSuggestionModelMetadata.php b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1ArticleSuggestionModelMetadata.php deleted file mode 100644 index 9e5fc84..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1ArticleSuggestionModelMetadata.php +++ /dev/null @@ -1,30 +0,0 @@ -modelType = $modelType; - } - public function getModelType() - { - return $this->modelType; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1ConversationModel.php b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1ConversationModel.php deleted file mode 100644 index 96db928..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1ConversationModel.php +++ /dev/null @@ -1,90 +0,0 @@ -articleSuggestionModelMetadata = $articleSuggestionModelMetadata; - } - /** - * @return Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1ArticleSuggestionModelMetadata - */ - public function getArticleSuggestionModelMetadata() - { - return $this->articleSuggestionModelMetadata; - } - public function setCreateTime($createTime) - { - $this->createTime = $createTime; - } - public function getCreateTime() - { - return $this->createTime; - } - /** - * @param Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1InputDataset - */ - public function setDatasets($datasets) - { - $this->datasets = $datasets; - } - /** - * @return Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1InputDataset - */ - public function getDatasets() - { - return $this->datasets; - } - public function setDisplayName($displayName) - { - $this->displayName = $displayName; - } - public function getDisplayName() - { - return $this->displayName; - } - public function setName($name) - { - $this->name = $name; - } - public function getName() - { - return $this->name; - } - public function setState($state) - { - $this->state = $state; - } - public function getState() - { - return $this->state; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1EntityType.php b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1EntityType.php index 96b706e..5862298 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1EntityType.php +++ b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1EntityType.php @@ -20,6 +20,7 @@ class Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1EntityType extends G protected $collection_key = 'entities'; public $autoExpansionMode; public $displayName; + public $enableFuzzyExtraction; protected $entitiesType = 'Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1EntityTypeEntity'; protected $entitiesDataType = 'array'; public $kind; @@ -41,6 +42,14 @@ class Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1EntityType extends G { return $this->displayName; } + public function setEnableFuzzyExtraction($enableFuzzyExtraction) + { + $this->enableFuzzyExtraction = $enableFuzzyExtraction; + } + public function getEnableFuzzyExtraction() + { + return $this->enableFuzzyExtraction; + } /** * @param Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1EntityTypeEntity */ diff --git a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1IntentMessage.php b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1IntentMessage.php index f0dbfd7..64a58bb 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1IntentMessage.php +++ b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1IntentMessage.php @@ -19,6 +19,8 @@ class Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessage extend { protected $basicCardType = 'Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageBasicCard'; protected $basicCardDataType = ''; + protected $browseCarouselCardType = 'Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageBrowseCarouselCard'; + protected $browseCarouselCardDataType = ''; protected $cardType = 'Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageCard'; protected $cardDataType = ''; protected $carouselSelectType = 'Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageCarouselSelect'; @@ -29,6 +31,8 @@ class Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessage extend protected $linkOutSuggestionDataType = ''; protected $listSelectType = 'Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageListSelect'; protected $listSelectDataType = ''; + protected $mediaContentType = 'Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageMediaContent'; + protected $mediaContentDataType = ''; public $payload; public $platform; protected $quickRepliesType = 'Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageQuickReplies'; @@ -43,6 +47,8 @@ class Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessage extend protected $simpleResponsesDataType = ''; protected $suggestionsType = 'Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageSuggestions'; protected $suggestionsDataType = ''; + protected $tableCardType = 'Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageTableCard'; + protected $tableCardDataType = ''; protected $telephonyPlayAudioType = 'Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageTelephonyPlayAudio'; protected $telephonyPlayAudioDataType = ''; protected $telephonySynthesizeSpeechType = 'Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageTelephonySynthesizeSpeech'; @@ -66,6 +72,20 @@ class Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessage extend { return $this->basicCard; } + /** + * @param Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageBrowseCarouselCard + */ + public function setBrowseCarouselCard(Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageBrowseCarouselCard $browseCarouselCard) + { + $this->browseCarouselCard = $browseCarouselCard; + } + /** + * @return Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageBrowseCarouselCard + */ + public function getBrowseCarouselCard() + { + return $this->browseCarouselCard; + } /** * @param Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageCard */ @@ -136,6 +156,20 @@ class Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessage extend { return $this->listSelect; } + /** + * @param Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageMediaContent + */ + public function setMediaContent(Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageMediaContent $mediaContent) + { + $this->mediaContent = $mediaContent; + } + /** + * @return Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageMediaContent + */ + public function getMediaContent() + { + return $this->mediaContent; + } public function setPayload($payload) { $this->payload = $payload; @@ -236,6 +270,20 @@ class Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessage extend { return $this->suggestions; } + /** + * @param Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageTableCard + */ + public function setTableCard(Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageTableCard $tableCard) + { + $this->tableCard = $tableCard; + } + /** + * @return Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageTableCard + */ + public function getTableCard() + { + return $this->tableCard; + } /** * @param Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageTelephonyPlayAudio */ diff --git a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1IntentMessageBrowseCarouselCard.php b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1IntentMessageBrowseCarouselCard.php new file mode 100644 index 0000000..be48e32 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1IntentMessageBrowseCarouselCard.php @@ -0,0 +1,47 @@ +imageDisplayOptions = $imageDisplayOptions; + } + public function getImageDisplayOptions() + { + return $this->imageDisplayOptions; + } + /** + * @param Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageBrowseCarouselCardBrowseCarouselCardItem + */ + public function setItems($items) + { + $this->items = $items; + } + /** + * @return Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageBrowseCarouselCardBrowseCarouselCardItem + */ + public function getItems() + { + return $this->items; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1IntentMessageBrowseCarouselCardBrowseCarouselCardItem.php b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1IntentMessageBrowseCarouselCardBrowseCarouselCardItem.php new file mode 100644 index 0000000..30bbc95 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1IntentMessageBrowseCarouselCardBrowseCarouselCardItem.php @@ -0,0 +1,80 @@ +description = $description; + } + public function getDescription() + { + return $this->description; + } + public function setFooter($footer) + { + $this->footer = $footer; + } + public function getFooter() + { + return $this->footer; + } + /** + * @param Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageImage + */ + public function setImage(Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageImage $image) + { + $this->image = $image; + } + /** + * @return Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageImage + */ + public function getImage() + { + return $this->image; + } + /** + * @param Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageBrowseCarouselCardBrowseCarouselCardItemOpenUrlAction + */ + public function setOpenUriAction(Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageBrowseCarouselCardBrowseCarouselCardItemOpenUrlAction $openUriAction) + { + $this->openUriAction = $openUriAction; + } + /** + * @return Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageBrowseCarouselCardBrowseCarouselCardItemOpenUrlAction + */ + public function getOpenUriAction() + { + return $this->openUriAction; + } + public function setTitle($title) + { + $this->title = $title; + } + public function getTitle() + { + return $this->title; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1WebDetectionWebImage.php b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1IntentMessageBrowseCarouselCardBrowseCarouselCardItemOpenUrlAction.php similarity index 70% rename from vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1WebDetectionWebImage.php rename to vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1IntentMessageBrowseCarouselCardBrowseCarouselCardItemOpenUrlAction.php index abfaa41..9064357 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1WebDetectionWebImage.php +++ b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1IntentMessageBrowseCarouselCardBrowseCarouselCardItemOpenUrlAction.php @@ -15,19 +15,11 @@ * the License. */ -class Google_Service_Vision_GoogleCloudVisionV1p5beta1WebDetectionWebImage extends Google_Model +class Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageBrowseCarouselCardBrowseCarouselCardItemOpenUrlAction extends Google_Model { - public $score; public $url; + public $urlTypeHint; - public function setScore($score) - { - $this->score = $score; - } - public function getScore() - { - return $this->score; - } public function setUrl($url) { $this->url = $url; @@ -36,4 +28,12 @@ class Google_Service_Vision_GoogleCloudVisionV1p5beta1WebDetectionWebImage exten { return $this->url; } + public function setUrlTypeHint($urlTypeHint) + { + $this->urlTypeHint = $urlTypeHint; + } + public function getUrlTypeHint() + { + return $this->urlTypeHint; + } } diff --git a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1IntentMessageColumnProperties.php b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1IntentMessageColumnProperties.php new file mode 100644 index 0000000..0fe12f6 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1IntentMessageColumnProperties.php @@ -0,0 +1,39 @@ +header = $header; + } + public function getHeader() + { + return $this->header; + } + public function setHorizontalAlignment($horizontalAlignment) + { + $this->horizontalAlignment = $horizontalAlignment; + } + public function getHorizontalAlignment() + { + return $this->horizontalAlignment; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1IntentMessageMediaContent.php b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1IntentMessageMediaContent.php new file mode 100644 index 0000000..589945a --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1IntentMessageMediaContent.php @@ -0,0 +1,47 @@ +mediaObjects = $mediaObjects; + } + /** + * @return Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageMediaContentResponseMediaObject + */ + public function getMediaObjects() + { + return $this->mediaObjects; + } + public function setMediaType($mediaType) + { + $this->mediaType = $mediaType; + } + public function getMediaType() + { + return $this->mediaType; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1IntentMessageMediaContentResponseMediaObject.php b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1IntentMessageMediaContentResponseMediaObject.php new file mode 100644 index 0000000..8e48042 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1IntentMessageMediaContentResponseMediaObject.php @@ -0,0 +1,80 @@ +contentUrl = $contentUrl; + } + public function getContentUrl() + { + return $this->contentUrl; + } + public function setDescription($description) + { + $this->description = $description; + } + public function getDescription() + { + return $this->description; + } + /** + * @param Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageImage + */ + public function setIcon(Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageImage $icon) + { + $this->icon = $icon; + } + /** + * @return Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageImage + */ + public function getIcon() + { + return $this->icon; + } + /** + * @param Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageImage + */ + public function setLargeImage(Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageImage $largeImage) + { + $this->largeImage = $largeImage; + } + /** + * @return Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageImage + */ + public function getLargeImage() + { + return $this->largeImage; + } + public function setName($name) + { + $this->name = $name; + } + public function getName() + { + return $this->name; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1IntentMessageTableCard.php b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1IntentMessageTableCard.php new file mode 100644 index 0000000..1045047 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1IntentMessageTableCard.php @@ -0,0 +1,104 @@ +buttons = $buttons; + } + /** + * @return Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageBasicCardButton + */ + public function getButtons() + { + return $this->buttons; + } + /** + * @param Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageColumnProperties + */ + public function setColumnProperties($columnProperties) + { + $this->columnProperties = $columnProperties; + } + /** + * @return Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageColumnProperties + */ + public function getColumnProperties() + { + return $this->columnProperties; + } + /** + * @param Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageImage + */ + public function setImage(Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageImage $image) + { + $this->image = $image; + } + /** + * @return Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageImage + */ + public function getImage() + { + return $this->image; + } + /** + * @param Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageTableCardRow + */ + public function setRows($rows) + { + $this->rows = $rows; + } + /** + * @return Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageTableCardRow + */ + public function getRows() + { + return $this->rows; + } + public function setSubtitle($subtitle) + { + $this->subtitle = $subtitle; + } + public function getSubtitle() + { + return $this->subtitle; + } + public function setTitle($title) + { + $this->title = $title; + } + public function getTitle() + { + return $this->title; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1IntentMessageTableCardCell.php b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1IntentMessageTableCardCell.php new file mode 100644 index 0000000..5c5b397 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1IntentMessageTableCardCell.php @@ -0,0 +1,30 @@ +text = $text; + } + public function getText() + { + return $this->text; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1TableTableRow.php b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1IntentMessageTableCardRow.php similarity index 57% rename from vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1TableTableRow.php rename to vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1IntentMessageTableCardRow.php index c940a84..99f409c 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1TableTableRow.php +++ b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1IntentMessageTableCardRow.php @@ -15,24 +15,33 @@ * the License. */ -class Google_Service_Vision_GoogleCloudVisionV1p5beta1TableTableRow extends Google_Collection +class Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageTableCardRow extends Google_Collection { protected $collection_key = 'cells'; - protected $cellsType = 'Google_Service_Vision_GoogleCloudVisionV1p5beta1TableTableCell'; + protected $cellsType = 'Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageTableCardCell'; protected $cellsDataType = 'array'; + public $dividerAfter; /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1TableTableCell + * @param Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageTableCardCell */ public function setCells($cells) { $this->cells = $cells; } /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1TableTableCell + * @return Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1IntentMessageTableCardCell */ public function getCells() { return $this->cells; } + public function setDividerAfter($dividerAfter) + { + $this->dividerAfter = $dividerAfter; + } + public function getDividerAfter() + { + return $this->dividerAfter; + } } diff --git a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1SessionEntityType.php b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1SessionEntityType.php new file mode 100644 index 0000000..648c6a0 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1SessionEntityType.php @@ -0,0 +1,56 @@ +entities = $entities; + } + /** + * @return Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1EntityTypeEntity + */ + public function getEntities() + { + return $this->entities; + } + public function setEntityOverrideMode($entityOverrideMode) + { + $this->entityOverrideMode = $entityOverrideMode; + } + public function getEntityOverrideMode() + { + return $this->entityOverrideMode; + } + public function setName($name) + { + $this->name = $name; + } + public function getName() + { + return $this->name; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1WebhookResponse.php b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1WebhookResponse.php index 3049ea1..0259b25 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1WebhookResponse.php +++ b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/GoogleCloudDialogflowV2beta1WebhookResponse.php @@ -17,7 +17,7 @@ class Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1WebhookResponse extends Google_Collection { - protected $collection_key = 'outputContexts'; + protected $collection_key = 'sessionEntityTypes'; public $endInteraction; protected $followupEventInputType = 'Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1EventInput'; protected $followupEventInputDataType = ''; @@ -27,6 +27,8 @@ class Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1WebhookResponse exte protected $outputContextsType = 'Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1Context'; protected $outputContextsDataType = 'array'; public $payload; + protected $sessionEntityTypesType = 'Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1SessionEntityType'; + protected $sessionEntityTypesDataType = 'array'; public $source; public function setEndInteraction($endInteraction) @@ -95,6 +97,20 @@ class Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1WebhookResponse exte { return $this->payload; } + /** + * @param Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1SessionEntityType + */ + public function setSessionEntityTypes($sessionEntityTypes) + { + $this->sessionEntityTypes = $sessionEntityTypes; + } + /** + * @return Google_Service_Dialogflow_GoogleCloudDialogflowV2beta1SessionEntityType + */ + public function getSessionEntityTypes() + { + return $this->sessionEntityTypes; + } public function setSource($source) { $this->source = $source; diff --git a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/Resource/ProjectsAgent.php b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/Resource/ProjectsAgent.php index 496e12e..9391d8a 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/Resource/ProjectsAgent.php +++ b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/Resource/ProjectsAgent.php @@ -96,8 +96,8 @@ class Google_Service_Dialogflow_Resource_ProjectsAgent extends Google_Service_Re * `projects/`. * @param array $optParams Optional parameters. * - * @opt_param string pageToken Optional. The next_page_token value returned from - * a previous list request. + * @opt_param string pageToken The next_page_token value returned from a + * previous list request. * @opt_param int pageSize Optional. The maximum number of items to return in a * single page. By default 100 and at most 1000. * @return Google_Service_Dialogflow_GoogleCloudDialogflowV2SearchAgentsResponse diff --git a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/Resource/ProjectsAgentEntityTypes.php b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/Resource/ProjectsAgentEntityTypes.php index b5cc123..063ea54 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/Resource/ProjectsAgentEntityTypes.php +++ b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/Resource/ProjectsAgentEntityTypes.php @@ -123,15 +123,15 @@ class Google_Service_Dialogflow_Resource_ProjectsAgentEntityTypes extends Google * Format: `projects//agent`. * @param array $optParams Optional parameters. * + * @opt_param string pageToken Optional. The next_page_token value returned from + * a previous list request. + * @opt_param int pageSize Optional. The maximum number of items to return in a + * single page. By default 100 and at most 1000. * @opt_param string languageCode Optional. The language to list entity synonyms * for. If not specified, the agent's default language is used. [Many * languages](https://cloud.google.com/dialogflow/docs/reference/language) are * supported. Note: languages must be enabled in the agent before they can be * used. - * @opt_param string pageToken Optional. The next_page_token value returned from - * a previous list request. - * @opt_param int pageSize Optional. The maximum number of items to return in a - * single page. By default 100 and at most 1000. * @return Google_Service_Dialogflow_GoogleCloudDialogflowV2ListEntityTypesResponse */ public function listProjectsAgentEntityTypes($parent, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/Resource/ProjectsAgentIntents.php b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/Resource/ProjectsAgentIntents.php index 717333d..c6d955e 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/Resource/ProjectsAgentIntents.php +++ b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/Resource/ProjectsAgentIntents.php @@ -106,14 +106,14 @@ class Google_Service_Dialogflow_Resource_ProjectsAgentIntents extends Google_Ser * `projects//agent/intents/`. * @param array $optParams Optional parameters. * - * @opt_param string intentView Optional. The resource view to apply to the - * returned intent. * @opt_param string languageCode Optional. The language to retrieve training * phrases, parameters and rich messages for. If not specified, the agent's * default language is used. [Many * languages](https://cloud.google.com/dialogflow/docs/reference/language) are * supported. Note: languages must be enabled in the agent before they can be * used. + * @opt_param string intentView Optional. The resource view to apply to the + * returned intent. * @return Google_Service_Dialogflow_GoogleCloudDialogflowV2Intent */ public function get($name, $optParams = array()) @@ -130,6 +130,10 @@ class Google_Service_Dialogflow_Resource_ProjectsAgentIntents extends Google_Ser * `projects//agent`. * @param array $optParams Optional parameters. * + * @opt_param int pageSize Optional. The maximum number of items to return in a + * single page. By default 100 and at most 1000. + * @opt_param string intentView Optional. The resource view to apply to the + * returned intent. * @opt_param string languageCode Optional. The language to list training * phrases, parameters and rich messages for. If not specified, the agent's * default language is used. [Many @@ -138,10 +142,6 @@ class Google_Service_Dialogflow_Resource_ProjectsAgentIntents extends Google_Ser * used. * @opt_param string pageToken Optional. The next_page_token value returned from * a previous list request. - * @opt_param int pageSize Optional. The maximum number of items to return in a - * single page. By default 100 and at most 1000. - * @opt_param string intentView Optional. The resource view to apply to the - * returned intent. * @return Google_Service_Dialogflow_GoogleCloudDialogflowV2ListIntentsResponse */ public function listProjectsAgentIntents($parent, $optParams = array()) @@ -159,8 +159,6 @@ class Google_Service_Dialogflow_Resource_ProjectsAgentIntents extends Google_Ser * @param Google_Service_Dialogflow_GoogleCloudDialogflowV2Intent $postBody * @param array $optParams Optional parameters. * - * @opt_param string intentView Optional. The resource view to apply to the - * returned intent. * @opt_param string languageCode Optional. The language of training phrases, * parameters and rich messages defined in `intent`. If not specified, the * agent's default language is used. [Many @@ -169,6 +167,8 @@ class Google_Service_Dialogflow_Resource_ProjectsAgentIntents extends Google_Ser * used. * @opt_param string updateMask Optional. The mask to control which fields get * updated. + * @opt_param string intentView Optional. The resource view to apply to the + * returned intent. * @return Google_Service_Dialogflow_GoogleCloudDialogflowV2Intent */ public function patch($name, Google_Service_Dialogflow_GoogleCloudDialogflowV2Intent $postBody, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/Resource/ProjectsAgentSessionsContexts.php b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/Resource/ProjectsAgentSessionsContexts.php index 77f03ba..24dd552 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/Resource/ProjectsAgentSessionsContexts.php +++ b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/Resource/ProjectsAgentSessionsContexts.php @@ -79,10 +79,10 @@ class Google_Service_Dialogflow_Resource_ProjectsAgentSessionsContexts extends G * Format: `projects//agent/sessions/`. * @param array $optParams Optional parameters. * - * @opt_param string pageToken Optional. The next_page_token value returned from - * a previous list request. * @opt_param int pageSize Optional. The maximum number of items to return in a * single page. By default 100 and at most 1000. + * @opt_param string pageToken Optional. The next_page_token value returned from + * a previous list request. * @return Google_Service_Dialogflow_GoogleCloudDialogflowV2ListContextsResponse */ public function listProjectsAgentSessionsContexts($parent, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/Resource/ProjectsAgentSessionsEntityTypes.php b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/Resource/ProjectsAgentSessionsEntityTypes.php index fdea8fb..c9b6df0 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/Resource/ProjectsAgentSessionsEntityTypes.php +++ b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/Resource/ProjectsAgentSessionsEntityTypes.php @@ -29,7 +29,11 @@ class Google_Service_Dialogflow_Resource_ProjectsAgentSessionsEntityTypes extend * Creates a session entity type. * * If the specified session entity type already exists, overrides the session - * entity type. (entityTypes.create) + * entity type. + * + * This method doesn't work with Google Assistant integration. Contact + * Dialogflow support if you need to use session entities with Google Assistant + * integration. (entityTypes.create) * * @param string $parent Required. The session to create a session entity type * for. Format: `projects//agent/sessions/`. @@ -44,7 +48,11 @@ class Google_Service_Dialogflow_Resource_ProjectsAgentSessionsEntityTypes extend return $this->call('create', array($params), "Google_Service_Dialogflow_GoogleCloudDialogflowV2SessionEntityType"); } /** - * Deletes the specified session entity type. (entityTypes.delete) + * Deletes the specified session entity type. + * + * This method doesn't work with Google Assistant integration. Contact + * Dialogflow support if you need to use session entities with Google Assistant + * integration. (entityTypes.delete) * * @param string $name Required. The name of the entity type to delete. Format: * `projects//agent/sessions//entityTypes/`. @@ -58,7 +66,11 @@ class Google_Service_Dialogflow_Resource_ProjectsAgentSessionsEntityTypes extend return $this->call('delete', array($params), "Google_Service_Dialogflow_GoogleProtobufEmpty"); } /** - * Retrieves the specified session entity type. (entityTypes.get) + * Retrieves the specified session entity type. + * + * This method doesn't work with Google Assistant integration. Contact + * Dialogflow support if you need to use session entities with Google Assistant + * integration. (entityTypes.get) * * @param string $name Required. The name of the session entity type. Format: * `projects//agent/sessions//entityTypes/`. @@ -73,7 +85,10 @@ class Google_Service_Dialogflow_Resource_ProjectsAgentSessionsEntityTypes extend } /** * Returns the list of all session entity types in the specified session. - * (entityTypes.listProjectsAgentSessionsEntityTypes) + * + * This method doesn't work with Google Assistant integration. Contact + * Dialogflow support if you need to use session entities with Google Assistant + * integration. (entityTypes.listProjectsAgentSessionsEntityTypes) * * @param string $parent Required. The session to list all session entity types * from. Format: `projects//agent/sessions/`. @@ -92,7 +107,11 @@ class Google_Service_Dialogflow_Resource_ProjectsAgentSessionsEntityTypes extend return $this->call('list', array($params), "Google_Service_Dialogflow_GoogleCloudDialogflowV2ListSessionEntityTypesResponse"); } /** - * Updates the specified session entity type. (entityTypes.patch) + * Updates the specified session entity type. + * + * This method doesn't work with Google Assistant integration. Contact + * Dialogflow support if you need to use session entities with Google Assistant + * integration. (entityTypes.patch) * * @param string $name Required. The unique identifier of this session entity * type. Format: `projects//agent/sessions//entityTypes/`. diff --git a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/Resource/ProjectsLocations.php b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/Resource/ProjectsLocations.php new file mode 100644 index 0000000..549f7f5 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/Resource/ProjectsLocations.php @@ -0,0 +1,28 @@ + + * $dialogflowService = new Google_Service_Dialogflow(...); + * $locations = $dialogflowService->locations; + * + */ +class Google_Service_Dialogflow_Resource_ProjectsLocations extends Google_Service_Resource +{ +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/Resource/ProjectsLocationsOperations.php b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/Resource/ProjectsLocationsOperations.php new file mode 100644 index 0000000..506869d --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/Resource/ProjectsLocationsOperations.php @@ -0,0 +1,91 @@ + + * $dialogflowService = new Google_Service_Dialogflow(...); + * $operations = $dialogflowService->operations; + * + */ +class Google_Service_Dialogflow_Resource_ProjectsLocationsOperations extends Google_Service_Resource +{ + /** + * Starts asynchronous cancellation on a long-running operation. The server + * makes a best effort to cancel the operation, but success is not guaranteed. + * If the server doesn't support this method, it returns + * `google.rpc.Code.UNIMPLEMENTED`. Clients can use Operations.GetOperation or + * other methods to check whether the cancellation succeeded or whether the + * operation completed despite cancellation. On successful cancellation, the + * operation is not deleted; instead, it becomes an operation with an + * Operation.error value with a google.rpc.Status.code of 1, corresponding to + * `Code.CANCELLED`. (operations.cancel) + * + * @param string $name The name of the operation resource to be cancelled. + * @param array $optParams Optional parameters. + * @return Google_Service_Dialogflow_GoogleProtobufEmpty + */ + public function cancel($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('cancel', array($params), "Google_Service_Dialogflow_GoogleProtobufEmpty"); + } + /** + * Gets the latest state of a long-running operation. Clients can use this + * method to poll the operation result at intervals as recommended by the API + * service. (operations.get) + * + * @param string $name The name of the operation resource. + * @param array $optParams Optional parameters. + * @return Google_Service_Dialogflow_GoogleLongrunningOperation + */ + public function get($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('get', array($params), "Google_Service_Dialogflow_GoogleLongrunningOperation"); + } + /** + * Lists operations that match the specified filter in the request. If the + * server doesn't support this method, it returns `UNIMPLEMENTED`. + * + * NOTE: the `name` binding allows API services to override the binding to use + * different resource name schemes, such as `users/operations`. To override the + * binding, API services can add a binding such as + * `"/v1/{name=users}/operations"` to their service configuration. For backwards + * compatibility, the default name includes the operations collection id, + * however overriding users must ensure the name binding is the parent resource, + * without the operations collection id. + * (operations.listProjectsLocationsOperations) + * + * @param string $name The name of the operation's parent resource. + * @param array $optParams Optional parameters. + * + * @opt_param string filter The standard list filter. + * @opt_param string pageToken The standard list page token. + * @opt_param int pageSize The standard list page size. + * @return Google_Service_Dialogflow_GoogleLongrunningListOperationsResponse + */ + public function listProjectsLocationsOperations($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('list', array($params), "Google_Service_Dialogflow_GoogleLongrunningListOperationsResponse"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/Resource/ProjectsOperations.php b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/Resource/ProjectsOperations.php index e20747d..e4e3b8b 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dialogflow/Resource/ProjectsOperations.php +++ b/vendor/google/apiclient-services/src/Google/Service/Dialogflow/Resource/ProjectsOperations.php @@ -25,6 +25,27 @@ */ class Google_Service_Dialogflow_Resource_ProjectsOperations extends Google_Service_Resource { + /** + * Starts asynchronous cancellation on a long-running operation. The server + * makes a best effort to cancel the operation, but success is not guaranteed. + * If the server doesn't support this method, it returns + * `google.rpc.Code.UNIMPLEMENTED`. Clients can use Operations.GetOperation or + * other methods to check whether the cancellation succeeded or whether the + * operation completed despite cancellation. On successful cancellation, the + * operation is not deleted; instead, it becomes an operation with an + * Operation.error value with a google.rpc.Status.code of 1, corresponding to + * `Code.CANCELLED`. (operations.cancel) + * + * @param string $name The name of the operation resource to be cancelled. + * @param array $optParams Optional parameters. + * @return Google_Service_Dialogflow_GoogleProtobufEmpty + */ + public function cancel($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('cancel', array($params), "Google_Service_Dialogflow_GoogleProtobufEmpty"); + } /** * Gets the latest state of a long-running operation. Clients can use this * method to poll the operation result at intervals as recommended by the API diff --git a/vendor/google/apiclient-services/src/Google/Service/Directory.php b/vendor/google/apiclient-services/src/Google/Service/Directory.php index ec3bc63..4422fe1 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Directory.php +++ b/vendor/google/apiclient-services/src/Google/Service/Directory.php @@ -112,6 +112,9 @@ class Google_Service_Directory extends Google_Service /** View user schemas on your domain. */ const ADMIN_DIRECTORY_USERSCHEMA_READONLY = "https://www.googleapis.com/auth/admin.directory.userschema.readonly"; + /** View and manage your data across Google Cloud Platform services. */ + const CLOUD_PLATFORM = + "https://www.googleapis.com/auth/cloud-platform"; public $asps; public $channels; diff --git a/vendor/google/apiclient-services/src/Google/Service/Dns.php b/vendor/google/apiclient-services/src/Google/Service/Dns.php index e6cbc06..4e8199b 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dns.php +++ b/vendor/google/apiclient-services/src/Google/Service/Dns.php @@ -47,6 +47,7 @@ class Google_Service_Dns extends Google_Service public $dnsKeys; public $managedZoneOperations; public $managedZones; + public $policies; public $projects; public $resourceRecordSets; @@ -397,6 +398,124 @@ class Google_Service_Dns extends Google_Service ) ) ); + $this->policies = new Google_Service_Dns_Resource_Policies( + $this, + $this->serviceName, + 'policies', + array( + 'methods' => array( + 'create' => array( + 'path' => '{project}/policies', + 'httpMethod' => 'POST', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'clientOperationId' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'delete' => array( + 'path' => '{project}/policies/{policy}', + 'httpMethod' => 'DELETE', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'policy' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'clientOperationId' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'get' => array( + 'path' => '{project}/policies/{policy}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'policy' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'clientOperationId' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'list' => array( + 'path' => '{project}/policies', + 'httpMethod' => 'GET', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'maxResults' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'patch' => array( + 'path' => '{project}/policies/{policy}', + 'httpMethod' => 'PATCH', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'policy' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'clientOperationId' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'update' => array( + 'path' => '{project}/policies/{policy}', + 'httpMethod' => 'PUT', + 'parameters' => array( + 'project' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'policy' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'clientOperationId' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ), + ) + ) + ); $this->projects = new Google_Service_Dns_Resource_Projects( $this, $this->serviceName, diff --git a/vendor/google/apiclient-services/src/Google/Service/Dns/ManagedZone.php b/vendor/google/apiclient-services/src/Google/Service/Dns/ManagedZone.php index e6bb2fd..dfe36a7 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dns/ManagedZone.php +++ b/vendor/google/apiclient-services/src/Google/Service/Dns/ManagedZone.php @@ -23,6 +23,8 @@ class Google_Service_Dns_ManagedZone extends Google_Collection public $dnsName; protected $dnssecConfigType = 'Google_Service_Dns_ManagedZoneDnsSecConfig'; protected $dnssecConfigDataType = ''; + protected $forwardingConfigType = 'Google_Service_Dns_ManagedZoneForwardingConfig'; + protected $forwardingConfigDataType = ''; public $id; public $kind; public $labels; @@ -71,6 +73,20 @@ class Google_Service_Dns_ManagedZone extends Google_Collection { return $this->dnssecConfig; } + /** + * @param Google_Service_Dns_ManagedZoneForwardingConfig + */ + public function setForwardingConfig(Google_Service_Dns_ManagedZoneForwardingConfig $forwardingConfig) + { + $this->forwardingConfig = $forwardingConfig; + } + /** + * @return Google_Service_Dns_ManagedZoneForwardingConfig + */ + public function getForwardingConfig() + { + return $this->forwardingConfig; + } public function setId($id) { $this->id = $id; diff --git a/vendor/google/apiclient-services/src/Google/Service/Dns/ManagedZoneForwardingConfig.php b/vendor/google/apiclient-services/src/Google/Service/Dns/ManagedZoneForwardingConfig.php new file mode 100644 index 0000000..9ab215e --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Dns/ManagedZoneForwardingConfig.php @@ -0,0 +1,47 @@ +kind = $kind; + } + public function getKind() + { + return $this->kind; + } + /** + * @param Google_Service_Dns_ManagedZoneForwardingConfigNameServerTarget + */ + public function setTargetNameServers($targetNameServers) + { + $this->targetNameServers = $targetNameServers; + } + /** + * @return Google_Service_Dns_ManagedZoneForwardingConfigNameServerTarget + */ + public function getTargetNameServers() + { + return $this->targetNameServers; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dns/ManagedZoneForwardingConfigNameServerTarget.php b/vendor/google/apiclient-services/src/Google/Service/Dns/ManagedZoneForwardingConfigNameServerTarget.php new file mode 100644 index 0000000..01e22f1 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Dns/ManagedZoneForwardingConfigNameServerTarget.php @@ -0,0 +1,39 @@ +ipv4Address = $ipv4Address; + } + public function getIpv4Address() + { + return $this->ipv4Address; + } + public function setKind($kind) + { + $this->kind = $kind; + } + public function getKind() + { + return $this->kind; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dns/PoliciesListResponse.php b/vendor/google/apiclient-services/src/Google/Service/Dns/PoliciesListResponse.php new file mode 100644 index 0000000..2c6cf96 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Dns/PoliciesListResponse.php @@ -0,0 +1,72 @@ +header = $header; + } + /** + * @return Google_Service_Dns_ResponseHeader + */ + public function getHeader() + { + return $this->header; + } + 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; + } + /** + * @param Google_Service_Dns_Policy + */ + public function setPolicies($policies) + { + $this->policies = $policies; + } + /** + * @return Google_Service_Dns_Policy + */ + public function getPolicies() + { + return $this->policies; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dns/PoliciesPatchResponse.php b/vendor/google/apiclient-services/src/Google/Service/Dns/PoliciesPatchResponse.php new file mode 100644 index 0000000..5bdb07f --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Dns/PoliciesPatchResponse.php @@ -0,0 +1,53 @@ +header = $header; + } + /** + * @return Google_Service_Dns_ResponseHeader + */ + public function getHeader() + { + return $this->header; + } + /** + * @param Google_Service_Dns_Policy + */ + public function setPolicy(Google_Service_Dns_Policy $policy) + { + $this->policy = $policy; + } + /** + * @return Google_Service_Dns_Policy + */ + public function getPolicy() + { + return $this->policy; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dns/PoliciesUpdateResponse.php b/vendor/google/apiclient-services/src/Google/Service/Dns/PoliciesUpdateResponse.php new file mode 100644 index 0000000..7633490 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Dns/PoliciesUpdateResponse.php @@ -0,0 +1,53 @@ +header = $header; + } + /** + * @return Google_Service_Dns_ResponseHeader + */ + public function getHeader() + { + return $this->header; + } + /** + * @param Google_Service_Dns_Policy + */ + public function setPolicy(Google_Service_Dns_Policy $policy) + { + $this->policy = $policy; + } + /** + * @return Google_Service_Dns_Policy + */ + public function getPolicy() + { + return $this->policy; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dns/Policy.php b/vendor/google/apiclient-services/src/Google/Service/Dns/Policy.php new file mode 100644 index 0000000..a5d5d71 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Dns/Policy.php @@ -0,0 +1,108 @@ +alternativeNameServerConfig = $alternativeNameServerConfig; + } + /** + * @return Google_Service_Dns_PolicyAlternativeNameServerConfig + */ + public function getAlternativeNameServerConfig() + { + return $this->alternativeNameServerConfig; + } + public function setDescription($description) + { + $this->description = $description; + } + public function getDescription() + { + return $this->description; + } + public function setEnableInboundForwarding($enableInboundForwarding) + { + $this->enableInboundForwarding = $enableInboundForwarding; + } + public function getEnableInboundForwarding() + { + return $this->enableInboundForwarding; + } + public function setEnableLogging($enableLogging) + { + $this->enableLogging = $enableLogging; + } + public function getEnableLogging() + { + return $this->enableLogging; + } + 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; + } + /** + * @param Google_Service_Dns_PolicyNetwork + */ + public function setNetworks($networks) + { + $this->networks = $networks; + } + /** + * @return Google_Service_Dns_PolicyNetwork + */ + public function getNetworks() + { + return $this->networks; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dns/PolicyAlternativeNameServerConfig.php b/vendor/google/apiclient-services/src/Google/Service/Dns/PolicyAlternativeNameServerConfig.php new file mode 100644 index 0000000..1e93ead --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Dns/PolicyAlternativeNameServerConfig.php @@ -0,0 +1,47 @@ +kind = $kind; + } + public function getKind() + { + return $this->kind; + } + /** + * @param Google_Service_Dns_PolicyAlternativeNameServerConfigTargetNameServer + */ + public function setTargetNameServers($targetNameServers) + { + $this->targetNameServers = $targetNameServers; + } + /** + * @return Google_Service_Dns_PolicyAlternativeNameServerConfigTargetNameServer + */ + public function getTargetNameServers() + { + return $this->targetNameServers; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dns/PolicyAlternativeNameServerConfigTargetNameServer.php b/vendor/google/apiclient-services/src/Google/Service/Dns/PolicyAlternativeNameServerConfigTargetNameServer.php new file mode 100644 index 0000000..4435f10 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Dns/PolicyAlternativeNameServerConfigTargetNameServer.php @@ -0,0 +1,39 @@ +ipv4Address = $ipv4Address; + } + public function getIpv4Address() + { + return $this->ipv4Address; + } + public function setKind($kind) + { + $this->kind = $kind; + } + public function getKind() + { + return $this->kind; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dns/PolicyNetwork.php b/vendor/google/apiclient-services/src/Google/Service/Dns/PolicyNetwork.php new file mode 100644 index 0000000..167f386 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Dns/PolicyNetwork.php @@ -0,0 +1,39 @@ +kind = $kind; + } + public function getKind() + { + return $this->kind; + } + public function setNetworkUrl($networkUrl) + { + $this->networkUrl = $networkUrl; + } + public function getNetworkUrl() + { + return $this->networkUrl; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dns/Quota.php b/vendor/google/apiclient-services/src/Google/Service/Dns/Quota.php index e430b51..729e6ca 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dns/Quota.php +++ b/vendor/google/apiclient-services/src/Google/Service/Dns/Quota.php @@ -23,10 +23,14 @@ class Google_Service_Dns_Quota extends Google_Collection public $managedZones; public $managedZonesPerNetwork; public $networksPerManagedZone; + public $networksPerPolicy; + public $policies; public $resourceRecordsPerRrset; public $rrsetAdditionsPerChange; public $rrsetDeletionsPerChange; public $rrsetsPerManagedZone; + public $targetNameServersPerManagedZone; + public $targetNameServersPerPolicy; public $totalRrdataSizePerChange; protected $whitelistedKeySpecsType = 'Google_Service_Dns_DnsKeySpec'; protected $whitelistedKeySpecsDataType = 'array'; @@ -71,6 +75,22 @@ class Google_Service_Dns_Quota extends Google_Collection { return $this->networksPerManagedZone; } + public function setNetworksPerPolicy($networksPerPolicy) + { + $this->networksPerPolicy = $networksPerPolicy; + } + public function getNetworksPerPolicy() + { + return $this->networksPerPolicy; + } + public function setPolicies($policies) + { + $this->policies = $policies; + } + public function getPolicies() + { + return $this->policies; + } public function setResourceRecordsPerRrset($resourceRecordsPerRrset) { $this->resourceRecordsPerRrset = $resourceRecordsPerRrset; @@ -103,6 +123,22 @@ class Google_Service_Dns_Quota extends Google_Collection { return $this->rrsetsPerManagedZone; } + public function setTargetNameServersPerManagedZone($targetNameServersPerManagedZone) + { + $this->targetNameServersPerManagedZone = $targetNameServersPerManagedZone; + } + public function getTargetNameServersPerManagedZone() + { + return $this->targetNameServersPerManagedZone; + } + public function setTargetNameServersPerPolicy($targetNameServersPerPolicy) + { + $this->targetNameServersPerPolicy = $targetNameServersPerPolicy; + } + public function getTargetNameServersPerPolicy() + { + return $this->targetNameServersPerPolicy; + } public function setTotalRrdataSizePerChange($totalRrdataSizePerChange) { $this->totalRrdataSizePerChange = $totalRrdataSizePerChange; diff --git a/vendor/google/apiclient-services/src/Google/Service/Dns/Resource/Policies.php b/vendor/google/apiclient-services/src/Google/Service/Dns/Resource/Policies.php new file mode 100644 index 0000000..37fbaca --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Dns/Resource/Policies.php @@ -0,0 +1,143 @@ + + * $dnsService = new Google_Service_Dns(...); + * $policies = $dnsService->policies; + * + */ +class Google_Service_Dns_Resource_Policies extends Google_Service_Resource +{ + /** + * Create a new Policy (policies.create) + * + * @param string $project Identifies the project addressed by this request. + * @param Google_Service_Dns_Policy $postBody + * @param array $optParams Optional parameters. + * + * @opt_param string clientOperationId For mutating operation requests only. An + * optional identifier specified by the client. Must be unique for operation + * resources in the Operations collection. + * @return Google_Service_Dns_Policy + */ + public function create($project, Google_Service_Dns_Policy $postBody, $optParams = array()) + { + $params = array('project' => $project, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('create', array($params), "Google_Service_Dns_Policy"); + } + /** + * Delete a previously created Policy. Will fail if the policy is still being + * referenced by a network. (policies.delete) + * + * @param string $project Identifies the project addressed by this request. + * @param string $policy User given friendly name of the policy addressed by + * this request. + * @param array $optParams Optional parameters. + * + * @opt_param string clientOperationId For mutating operation requests only. An + * optional identifier specified by the client. Must be unique for operation + * resources in the Operations collection. + */ + public function delete($project, $policy, $optParams = array()) + { + $params = array('project' => $project, 'policy' => $policy); + $params = array_merge($params, $optParams); + return $this->call('delete', array($params)); + } + /** + * Fetch the representation of an existing Policy. (policies.get) + * + * @param string $project Identifies the project addressed by this request. + * @param string $policy User given friendly name of the policy addressed by + * this request. + * @param array $optParams Optional parameters. + * + * @opt_param string clientOperationId For mutating operation requests only. An + * optional identifier specified by the client. Must be unique for operation + * resources in the Operations collection. + * @return Google_Service_Dns_Policy + */ + public function get($project, $policy, $optParams = array()) + { + $params = array('project' => $project, 'policy' => $policy); + $params = array_merge($params, $optParams); + return $this->call('get', array($params), "Google_Service_Dns_Policy"); + } + /** + * Enumerate all Policies associated with a project. (policies.listPolicies) + * + * @param string $project Identifies the project addressed by this request. + * @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. + * @return Google_Service_Dns_PoliciesListResponse + */ + public function listPolicies($project, $optParams = array()) + { + $params = array('project' => $project); + $params = array_merge($params, $optParams); + return $this->call('list', array($params), "Google_Service_Dns_PoliciesListResponse"); + } + /** + * Apply a partial update to an existing Policy. (policies.patch) + * + * @param string $project Identifies the project addressed by this request. + * @param string $policy User given friendly name of the policy addressed by + * this request. + * @param Google_Service_Dns_Policy $postBody + * @param array $optParams Optional parameters. + * + * @opt_param string clientOperationId For mutating operation requests only. An + * optional identifier specified by the client. Must be unique for operation + * resources in the Operations collection. + * @return Google_Service_Dns_PoliciesPatchResponse + */ + public function patch($project, $policy, Google_Service_Dns_Policy $postBody, $optParams = array()) + { + $params = array('project' => $project, 'policy' => $policy, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('patch', array($params), "Google_Service_Dns_PoliciesPatchResponse"); + } + /** + * Update an existing Policy. (policies.update) + * + * @param string $project Identifies the project addressed by this request. + * @param string $policy User given friendly name of the policy addressed by + * this request. + * @param Google_Service_Dns_Policy $postBody + * @param array $optParams Optional parameters. + * + * @opt_param string clientOperationId For mutating operation requests only. An + * optional identifier specified by the client. Must be unique for operation + * resources in the Operations collection. + * @return Google_Service_Dns_PoliciesUpdateResponse + */ + public function update($project, $policy, Google_Service_Dns_Policy $postBody, $optParams = array()) + { + $params = array('project' => $project, 'policy' => $policy, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('update', array($params), "Google_Service_Dns_PoliciesUpdateResponse"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Docs/MergeTableCellsRequest.php b/vendor/google/apiclient-services/src/Google/Service/Docs/MergeTableCellsRequest.php new file mode 100644 index 0000000..bff438c --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Docs/MergeTableCellsRequest.php @@ -0,0 +1,37 @@ +tableRange = $tableRange; + } + /** + * @return Google_Service_Docs_TableRange + */ + public function getTableRange() + { + return $this->tableRange; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1ImageAnnotationContext.php b/vendor/google/apiclient-services/src/Google/Service/Docs/ReplaceImageRequest.php similarity index 60% rename from vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1ImageAnnotationContext.php rename to vendor/google/apiclient-services/src/Google/Service/Docs/ReplaceImageRequest.php index 2cde721..68a39b9 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1ImageAnnotationContext.php +++ b/vendor/google/apiclient-services/src/Google/Service/Docs/ReplaceImageRequest.php @@ -15,18 +15,27 @@ * the License. */ -class Google_Service_Vision_GoogleCloudVisionV1p5beta1ImageAnnotationContext extends Google_Model +class Google_Service_Docs_ReplaceImageRequest extends Google_Model { - public $pageNumber; + public $imageObjectId; + public $imageReplaceMethod; public $uri; - public function setPageNumber($pageNumber) + public function setImageObjectId($imageObjectId) { - $this->pageNumber = $pageNumber; + $this->imageObjectId = $imageObjectId; } - public function getPageNumber() + public function getImageObjectId() { - return $this->pageNumber; + return $this->imageObjectId; + } + public function setImageReplaceMethod($imageReplaceMethod) + { + $this->imageReplaceMethod = $imageReplaceMethod; + } + public function getImageReplaceMethod() + { + return $this->imageReplaceMethod; } public function setUri($uri) { diff --git a/vendor/google/apiclient-services/src/Google/Service/Docs/Request.php b/vendor/google/apiclient-services/src/Google/Service/Docs/Request.php index ecf21fe..fb3078c 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Docs/Request.php +++ b/vendor/google/apiclient-services/src/Google/Service/Docs/Request.php @@ -45,8 +45,14 @@ class Google_Service_Docs_Request extends Google_Model protected $insertTableRowDataType = ''; protected $insertTextType = 'Google_Service_Docs_InsertTextRequest'; protected $insertTextDataType = ''; + protected $mergeTableCellsType = 'Google_Service_Docs_MergeTableCellsRequest'; + protected $mergeTableCellsDataType = ''; protected $replaceAllTextType = 'Google_Service_Docs_ReplaceAllTextRequest'; protected $replaceAllTextDataType = ''; + protected $replaceImageType = 'Google_Service_Docs_ReplaceImageRequest'; + protected $replaceImageDataType = ''; + protected $unmergeTableCellsType = 'Google_Service_Docs_UnmergeTableCellsRequest'; + protected $unmergeTableCellsDataType = ''; protected $updateDocumentStyleType = 'Google_Service_Docs_UpdateDocumentStyleRequest'; protected $updateDocumentStyleDataType = ''; protected $updateParagraphStyleType = 'Google_Service_Docs_UpdateParagraphStyleRequest'; @@ -256,6 +262,20 @@ class Google_Service_Docs_Request extends Google_Model { return $this->insertText; } + /** + * @param Google_Service_Docs_MergeTableCellsRequest + */ + public function setMergeTableCells(Google_Service_Docs_MergeTableCellsRequest $mergeTableCells) + { + $this->mergeTableCells = $mergeTableCells; + } + /** + * @return Google_Service_Docs_MergeTableCellsRequest + */ + public function getMergeTableCells() + { + return $this->mergeTableCells; + } /** * @param Google_Service_Docs_ReplaceAllTextRequest */ @@ -270,6 +290,34 @@ class Google_Service_Docs_Request extends Google_Model { return $this->replaceAllText; } + /** + * @param Google_Service_Docs_ReplaceImageRequest + */ + public function setReplaceImage(Google_Service_Docs_ReplaceImageRequest $replaceImage) + { + $this->replaceImage = $replaceImage; + } + /** + * @return Google_Service_Docs_ReplaceImageRequest + */ + public function getReplaceImage() + { + return $this->replaceImage; + } + /** + * @param Google_Service_Docs_UnmergeTableCellsRequest + */ + public function setUnmergeTableCells(Google_Service_Docs_UnmergeTableCellsRequest $unmergeTableCells) + { + $this->unmergeTableCells = $unmergeTableCells; + } + /** + * @return Google_Service_Docs_UnmergeTableCellsRequest + */ + public function getUnmergeTableCells() + { + return $this->unmergeTableCells; + } /** * @param Google_Service_Docs_UpdateDocumentStyleRequest */ diff --git a/vendor/google/apiclient-services/src/Google/Service/Docs/UnmergeTableCellsRequest.php b/vendor/google/apiclient-services/src/Google/Service/Docs/UnmergeTableCellsRequest.php new file mode 100644 index 0000000..00abeae --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Docs/UnmergeTableCellsRequest.php @@ -0,0 +1,37 @@ +tableRange = $tableRange; + } + /** + * @return Google_Service_Docs_TableRange + */ + public function getTableRange() + { + return $this->tableRange; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/DomainsRDAP.php b/vendor/google/apiclient-services/src/Google/Service/DomainsRDAP.php new file mode 100644 index 0000000..bb81b79 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/DomainsRDAP.php @@ -0,0 +1,194 @@ + + * Read-only public API that lets users search for information about domain + * names.

+ * + *

+ * For more information about this service, see the API + * Documentation + *

+ * + * @author Google, Inc. + */ +class Google_Service_DomainsRDAP extends Google_Service +{ + + + public $autnum; + public $domain; + public $entity; + public $ip; + public $nameserver; + public $v1; + + /** + * Constructs the internal representation of the DomainsRDAP service. + * + * @param Google_Client $client The client used to deliver requests. + * @param string $rootUrl The root URL used for requests to the service. + */ + public function __construct(Google_Client $client, $rootUrl = null) + { + parent::__construct($client); + $this->rootUrl = $rootUrl ?: 'https://domainsrdap.googleapis.com/'; + $this->servicePath = ''; + $this->batchPath = 'batch'; + $this->version = 'v1'; + $this->serviceName = 'domainsrdap'; + + $this->autnum = new Google_Service_DomainsRDAP_Resource_Autnum( + $this, + $this->serviceName, + 'autnum', + array( + 'methods' => array( + 'get' => array( + 'path' => 'v1/autnum/{autnumId}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'autnumId' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ), + ) + ) + ); + $this->domain = new Google_Service_DomainsRDAP_Resource_Domain( + $this, + $this->serviceName, + 'domain', + array( + 'methods' => array( + 'get' => array( + 'path' => 'v1/domain/{+domainName}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'domainName' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ), + ) + ) + ); + $this->entity = new Google_Service_DomainsRDAP_Resource_Entity( + $this, + $this->serviceName, + 'entity', + array( + 'methods' => array( + 'get' => array( + 'path' => 'v1/entity/{entityId}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'entityId' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ), + ) + ) + ); + $this->ip = new Google_Service_DomainsRDAP_Resource_Ip( + $this, + $this->serviceName, + 'ip', + array( + 'methods' => array( + 'get' => array( + 'path' => 'v1/ip/{ipId}/{ipId1}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'ipId' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'ipId1' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ), + ) + ) + ); + $this->nameserver = new Google_Service_DomainsRDAP_Resource_Nameserver( + $this, + $this->serviceName, + 'nameserver', + array( + 'methods' => array( + 'get' => array( + 'path' => 'v1/nameserver/{nameserverId}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'nameserverId' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ), + ) + ) + ); + $this->v1 = new Google_Service_DomainsRDAP_Resource_V1( + $this, + $this->serviceName, + 'v1', + array( + 'methods' => array( + 'getDomains' => array( + 'path' => 'v1/domains', + 'httpMethod' => 'GET', + 'parameters' => array(), + ),'getEntities' => array( + 'path' => 'v1/entities', + 'httpMethod' => 'GET', + 'parameters' => array(), + ),'getHelp' => array( + 'path' => 'v1/help', + 'httpMethod' => 'GET', + 'parameters' => array(), + ),'getIp' => array( + 'path' => 'v1/ip', + 'httpMethod' => 'GET', + 'parameters' => array(), + ),'getNameservers' => array( + 'path' => 'v1/nameservers', + 'httpMethod' => 'GET', + 'parameters' => array(), + ), + ) + ) + ); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/DomainsRDAP/HttpBody.php b/vendor/google/apiclient-services/src/Google/Service/DomainsRDAP/HttpBody.php new file mode 100644 index 0000000..1776683 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/DomainsRDAP/HttpBody.php @@ -0,0 +1,49 @@ +contentType = $contentType; + } + public function getContentType() + { + return $this->contentType; + } + public function setData($data) + { + $this->data = $data; + } + public function getData() + { + return $this->data; + } + public function setExtensions($extensions) + { + $this->extensions = $extensions; + } + public function getExtensions() + { + return $this->extensions; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/DomainsRDAP/Link.php b/vendor/google/apiclient-services/src/Google/Service/DomainsRDAP/Link.php new file mode 100644 index 0000000..571bed9 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/DomainsRDAP/Link.php @@ -0,0 +1,84 @@ +href = $href; + } + public function getHref() + { + return $this->href; + } + public function setHreflang($hreflang) + { + $this->hreflang = $hreflang; + } + public function getHreflang() + { + return $this->hreflang; + } + public function setMedia($media) + { + $this->media = $media; + } + public function getMedia() + { + return $this->media; + } + public function setRel($rel) + { + $this->rel = $rel; + } + public function getRel() + { + return $this->rel; + } + public function setTitle($title) + { + $this->title = $title; + } + public function getTitle() + { + return $this->title; + } + 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; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/DomainsRDAP/Notice.php b/vendor/google/apiclient-services/src/Google/Service/DomainsRDAP/Notice.php new file mode 100644 index 0000000..1bc60a0 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/DomainsRDAP/Notice.php @@ -0,0 +1,65 @@ +description = $description; + } + public function getDescription() + { + return $this->description; + } + /** + * @param Google_Service_DomainsRDAP_Link + */ + public function setLinks($links) + { + $this->links = $links; + } + /** + * @return Google_Service_DomainsRDAP_Link + */ + public function getLinks() + { + return $this->links; + } + public function setTitle($title) + { + $this->title = $title; + } + public function getTitle() + { + return $this->title; + } + public function setType($type) + { + $this->type = $type; + } + public function getType() + { + return $this->type; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/DomainsRDAP/RdapResponse.php b/vendor/google/apiclient-services/src/Google/Service/DomainsRDAP/RdapResponse.php new file mode 100644 index 0000000..93ea8d2 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/DomainsRDAP/RdapResponse.php @@ -0,0 +1,99 @@ +description = $description; + } + public function getDescription() + { + return $this->description; + } + public function setErrorCode($errorCode) + { + $this->errorCode = $errorCode; + } + public function getErrorCode() + { + return $this->errorCode; + } + /** + * @param Google_Service_DomainsRDAP_HttpBody + */ + public function setJsonResponse(Google_Service_DomainsRDAP_HttpBody $jsonResponse) + { + $this->jsonResponse = $jsonResponse; + } + /** + * @return Google_Service_DomainsRDAP_HttpBody + */ + public function getJsonResponse() + { + return $this->jsonResponse; + } + public function setLang($lang) + { + $this->lang = $lang; + } + public function getLang() + { + return $this->lang; + } + /** + * @param Google_Service_DomainsRDAP_Notice + */ + public function setNotices($notices) + { + $this->notices = $notices; + } + /** + * @return Google_Service_DomainsRDAP_Notice + */ + public function getNotices() + { + return $this->notices; + } + public function setRdapConformance($rdapConformance) + { + $this->rdapConformance = $rdapConformance; + } + public function getRdapConformance() + { + return $this->rdapConformance; + } + public function setTitle($title) + { + $this->title = $title; + } + public function getTitle() + { + return $this->title; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/DomainsRDAP/Resource/Autnum.php b/vendor/google/apiclient-services/src/Google/Service/DomainsRDAP/Resource/Autnum.php new file mode 100644 index 0000000..40c11b5 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/DomainsRDAP/Resource/Autnum.php @@ -0,0 +1,42 @@ + + * $domainsrdapService = new Google_Service_DomainsRDAP(...); + * $autnum = $domainsrdapService->autnum; + * + */ +class Google_Service_DomainsRDAP_Resource_Autnum extends Google_Service_Resource +{ + /** + * The RDAP API recognizes this command from the RDAP specification but does not + * support it. The response is a formatted 501 error. (autnum.get) + * + * @param string $autnumId + * @param array $optParams Optional parameters. + * @return Google_Service_DomainsRDAP_RdapResponse + */ + public function get($autnumId, $optParams = array()) + { + $params = array('autnumId' => $autnumId); + $params = array_merge($params, $optParams); + return $this->call('get', array($params), "Google_Service_DomainsRDAP_RdapResponse"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/DomainsRDAP/Resource/Domain.php b/vendor/google/apiclient-services/src/Google/Service/DomainsRDAP/Resource/Domain.php new file mode 100644 index 0000000..051ebba --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/DomainsRDAP/Resource/Domain.php @@ -0,0 +1,41 @@ + + * $domainsrdapService = new Google_Service_DomainsRDAP(...); + * $domain = $domainsrdapService->domain; + * + */ +class Google_Service_DomainsRDAP_Resource_Domain extends Google_Service_Resource +{ + /** + * Look up RDAP information for a domain by name. (domain.get) + * + * @param string $domainName Full domain name to look up. Example: "example.com" + * @param array $optParams Optional parameters. + * @return Google_Service_DomainsRDAP_HttpBody + */ + public function get($domainName, $optParams = array()) + { + $params = array('domainName' => $domainName); + $params = array_merge($params, $optParams); + return $this->call('get', array($params), "Google_Service_DomainsRDAP_HttpBody"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/DomainsRDAP/Resource/Entity.php b/vendor/google/apiclient-services/src/Google/Service/DomainsRDAP/Resource/Entity.php new file mode 100644 index 0000000..49038f6 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/DomainsRDAP/Resource/Entity.php @@ -0,0 +1,42 @@ + + * $domainsrdapService = new Google_Service_DomainsRDAP(...); + * $entity = $domainsrdapService->entity; + * + */ +class Google_Service_DomainsRDAP_Resource_Entity extends Google_Service_Resource +{ + /** + * The RDAP API recognizes this command from the RDAP specification but does not + * support it. The response is a formatted 501 error. (entity.get) + * + * @param string $entityId + * @param array $optParams Optional parameters. + * @return Google_Service_DomainsRDAP_RdapResponse + */ + public function get($entityId, $optParams = array()) + { + $params = array('entityId' => $entityId); + $params = array_merge($params, $optParams); + return $this->call('get', array($params), "Google_Service_DomainsRDAP_RdapResponse"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/DomainsRDAP/Resource/Ip.php b/vendor/google/apiclient-services/src/Google/Service/DomainsRDAP/Resource/Ip.php new file mode 100644 index 0000000..b9dc39f --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/DomainsRDAP/Resource/Ip.php @@ -0,0 +1,43 @@ + + * $domainsrdapService = new Google_Service_DomainsRDAP(...); + * $ip = $domainsrdapService->ip; + * + */ +class Google_Service_DomainsRDAP_Resource_Ip extends Google_Service_Resource +{ + /** + * The RDAP API recognizes this command from the RDAP specification but does not + * support it. The response is a formatted 501 error. (ip.get) + * + * @param string $ipId + * @param string $ipId1 + * @param array $optParams Optional parameters. + * @return Google_Service_DomainsRDAP_RdapResponse + */ + public function get($ipId, $ipId1, $optParams = array()) + { + $params = array('ipId' => $ipId, 'ipId1' => $ipId1); + $params = array_merge($params, $optParams); + return $this->call('get', array($params), "Google_Service_DomainsRDAP_RdapResponse"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/DomainsRDAP/Resource/Nameserver.php b/vendor/google/apiclient-services/src/Google/Service/DomainsRDAP/Resource/Nameserver.php new file mode 100644 index 0000000..0efebac --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/DomainsRDAP/Resource/Nameserver.php @@ -0,0 +1,42 @@ + + * $domainsrdapService = new Google_Service_DomainsRDAP(...); + * $nameserver = $domainsrdapService->nameserver; + * + */ +class Google_Service_DomainsRDAP_Resource_Nameserver extends Google_Service_Resource +{ + /** + * The RDAP API recognizes this command from the RDAP specification but does not + * support it. The response is a formatted 501 error. (nameserver.get) + * + * @param string $nameserverId + * @param array $optParams Optional parameters. + * @return Google_Service_DomainsRDAP_RdapResponse + */ + public function get($nameserverId, $optParams = array()) + { + $params = array('nameserverId' => $nameserverId); + $params = array_merge($params, $optParams); + return $this->call('get', array($params), "Google_Service_DomainsRDAP_RdapResponse"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/DomainsRDAP/Resource/V1.php b/vendor/google/apiclient-services/src/Google/Service/DomainsRDAP/Resource/V1.php new file mode 100644 index 0000000..ded273c --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/DomainsRDAP/Resource/V1.php @@ -0,0 +1,93 @@ + + * $domainsrdapService = new Google_Service_DomainsRDAP(...); + * $v1 = $domainsrdapService->v1; + * + */ +class Google_Service_DomainsRDAP_Resource_V1 extends Google_Service_Resource +{ + /** + * The RDAP API recognizes this command from the RDAP specification but does not + * support it. The response is a formatted 501 error. (v1.getDomains) + * + * @param array $optParams Optional parameters. + * @return Google_Service_DomainsRDAP_RdapResponse + */ + public function getDomains($optParams = array()) + { + $params = array(); + $params = array_merge($params, $optParams); + return $this->call('getDomains', array($params), "Google_Service_DomainsRDAP_RdapResponse"); + } + /** + * The RDAP API recognizes this command from the RDAP specification but does not + * support it. The response is a formatted 501 error. (v1.getEntities) + * + * @param array $optParams Optional parameters. + * @return Google_Service_DomainsRDAP_RdapResponse + */ + public function getEntities($optParams = array()) + { + $params = array(); + $params = array_merge($params, $optParams); + return $this->call('getEntities', array($params), "Google_Service_DomainsRDAP_RdapResponse"); + } + /** + * Get help information for the RDAP API, including links to documentation. + * (v1.getHelp) + * + * @param array $optParams Optional parameters. + * @return Google_Service_DomainsRDAP_HttpBody + */ + public function getHelp($optParams = array()) + { + $params = array(); + $params = array_merge($params, $optParams); + return $this->call('getHelp', array($params), "Google_Service_DomainsRDAP_HttpBody"); + } + /** + * The RDAP API recognizes this command from the RDAP specification but does not + * support it. The response is a formatted 501 error. (v1.getIp) + * + * @param array $optParams Optional parameters. + * @return Google_Service_DomainsRDAP_HttpBody + */ + public function getIp($optParams = array()) + { + $params = array(); + $params = array_merge($params, $optParams); + return $this->call('getIp', array($params), "Google_Service_DomainsRDAP_HttpBody"); + } + /** + * The RDAP API recognizes this command from the RDAP specification but does not + * support it. The response is a formatted 501 error. (v1.getNameservers) + * + * @param array $optParams Optional parameters. + * @return Google_Service_DomainsRDAP_RdapResponse + */ + public function getNameservers($optParams = array()) + { + $params = array(); + $params = array_merge($params, $optParams); + return $this->call('getNameservers', array($params), "Google_Service_DomainsRDAP_RdapResponse"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Drive/DriveFileCapabilities.php b/vendor/google/apiclient-services/src/Google/Service/Drive/DriveFileCapabilities.php index 60a073a..c2b0d02 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Drive/DriveFileCapabilities.php +++ b/vendor/google/apiclient-services/src/Google/Service/Drive/DriveFileCapabilities.php @@ -27,6 +27,7 @@ class Google_Service_Drive_DriveFileCapabilities extends Google_Model public $canDownload; public $canEdit; public $canListChildren; + public $canModifyContent; public $canMoveChildrenOutOfDrive; public $canMoveChildrenOutOfTeamDrive; public $canMoveChildrenWithinDrive; @@ -127,6 +128,14 @@ class Google_Service_Drive_DriveFileCapabilities extends Google_Model { return $this->canListChildren; } + public function setCanModifyContent($canModifyContent) + { + $this->canModifyContent = $canModifyContent; + } + public function getCanModifyContent() + { + return $this->canModifyContent; + } public function setCanMoveChildrenOutOfDrive($canMoveChildrenOutOfDrive) { $this->canMoveChildrenOutOfDrive = $canMoveChildrenOutOfDrive; diff --git a/vendor/google/apiclient-services/src/Google/Service/Drive/Resource/Files.php b/vendor/google/apiclient-services/src/Google/Service/Drive/Resource/Files.php index 74dd736..d00011b 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Drive/Resource/Files.php +++ b/vendor/google/apiclient-services/src/Google/Service/Drive/Resource/Files.php @@ -40,7 +40,8 @@ class Google_Service_Drive_Resource_Files extends Google_Service_Resource * inherited from parent folders. * @opt_param bool keepRevisionForever Whether to set the 'keepForever' field in * the new head revision. This is only applicable to files with binary content - * in Google Drive. + * in Google Drive. Only 200 revisions for the file can be kept forever. If the + * limit is reached, try deleting pinned revisions. * @opt_param string ocrLanguage A language hint for OCR processing during image * import (ISO 639-1 code). * @opt_param bool supportsAllDrives Deprecated - Whether the requesting @@ -69,7 +70,8 @@ class Google_Service_Drive_Resource_Files extends Google_Service_Resource * inherited from parent folders. * @opt_param bool keepRevisionForever Whether to set the 'keepForever' field in * the new head revision. This is only applicable to files with binary content - * in Google Drive. + * in Google Drive. Only 200 revisions for the file can be kept forever. If the + * limit is reached, try deleting pinned revisions. * @opt_param string ocrLanguage A language hint for OCR processing during image * import (ISO 639-1 code). * @opt_param bool supportsAllDrives Deprecated - Whether the requesting @@ -233,7 +235,8 @@ class Google_Service_Drive_Resource_Files extends Google_Service_Resource * @opt_param string addParents A comma-separated list of parent IDs to add. * @opt_param bool keepRevisionForever Whether to set the 'keepForever' field in * the new head revision. This is only applicable to files with binary content - * in Google Drive. + * in Google Drive. Only 200 revisions for the file can be kept forever. If the + * limit is reached, try deleting pinned revisions. * @opt_param string ocrLanguage A language hint for OCR processing during image * import (ISO 639-1 code). * @opt_param string removeParents A comma-separated list of parent IDs to diff --git a/vendor/google/apiclient-services/src/Google/Service/FactCheckTools.php b/vendor/google/apiclient-services/src/Google/Service/FactCheckTools.php index 4f2104b..4417f68 100644 --- a/vendor/google/apiclient-services/src/Google/Service/FactCheckTools.php +++ b/vendor/google/apiclient-services/src/Google/Service/FactCheckTools.php @@ -62,6 +62,14 @@ class Google_Service_FactCheckTools extends Google_Service 'path' => 'v1alpha1/claims:search', 'httpMethod' => 'GET', 'parameters' => array( + 'languageCode' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'maxAgeDays' => array( + 'location' => 'query', + 'type' => 'integer', + ), 'offset' => array( 'location' => 'query', 'type' => 'integer', @@ -82,14 +90,6 @@ class Google_Service_FactCheckTools extends Google_Service 'location' => 'query', 'type' => 'string', ), - 'languageCode' => array( - 'location' => 'query', - 'type' => 'string', - ), - 'maxAgeDays' => array( - 'location' => 'query', - 'type' => 'integer', - ), ), ), ) @@ -129,6 +129,14 @@ class Google_Service_FactCheckTools extends Google_Service 'path' => 'v1alpha1/pages', 'httpMethod' => 'GET', 'parameters' => array( + 'offset' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), 'organization' => array( 'location' => 'query', 'type' => 'string', @@ -141,14 +149,6 @@ class Google_Service_FactCheckTools extends Google_Service 'location' => 'query', 'type' => 'string', ), - 'offset' => array( - 'location' => 'query', - 'type' => 'integer', - ), - 'pageToken' => array( - 'location' => 'query', - 'type' => 'string', - ), ), ),'update' => array( 'path' => 'v1alpha1/{+name}', diff --git a/vendor/google/apiclient-services/src/Google/Service/FactCheckTools/GoogleFactcheckingFactchecktoolsV1alpha1ClaimRating.php b/vendor/google/apiclient-services/src/Google/Service/FactCheckTools/GoogleFactcheckingFactchecktoolsV1alpha1ClaimRating.php index 92074d8..e6eb39b 100644 --- a/vendor/google/apiclient-services/src/Google/Service/FactCheckTools/GoogleFactcheckingFactchecktoolsV1alpha1ClaimRating.php +++ b/vendor/google/apiclient-services/src/Google/Service/FactCheckTools/GoogleFactcheckingFactchecktoolsV1alpha1ClaimRating.php @@ -19,6 +19,7 @@ class Google_Service_FactCheckTools_GoogleFactcheckingFactchecktoolsV1alpha1Clai { public $bestRating; public $imageUrl; + public $ratingExplanation; public $ratingValue; public $textualRating; public $worstRating; @@ -39,6 +40,14 @@ class Google_Service_FactCheckTools_GoogleFactcheckingFactchecktoolsV1alpha1Clai { return $this->imageUrl; } + public function setRatingExplanation($ratingExplanation) + { + $this->ratingExplanation = $ratingExplanation; + } + public function getRatingExplanation() + { + return $this->ratingExplanation; + } public function setRatingValue($ratingValue) { $this->ratingValue = $ratingValue; diff --git a/vendor/google/apiclient-services/src/Google/Service/FactCheckTools/Resource/Claims.php b/vendor/google/apiclient-services/src/Google/Service/FactCheckTools/Resource/Claims.php index 29de910..e0423dc 100644 --- a/vendor/google/apiclient-services/src/Google/Service/FactCheckTools/Resource/Claims.php +++ b/vendor/google/apiclient-services/src/Google/Service/FactCheckTools/Resource/Claims.php @@ -30,6 +30,12 @@ class Google_Service_FactCheckTools_Resource_Claims extends Google_Service_Resou * * @param array $optParams Optional parameters. * + * @opt_param string languageCode The BCP-47 language code, such as "en-US" or + * "sr-Latn". Can be used to restrict results by language, though we do not + * currently consider the region. + * @opt_param int maxAgeDays The maximum age of the returned search results, in + * days. Age is determined by either claim date or review date, whichever is + * newer. * @opt_param int offset An integer that specifies the current offset (that is, * starting result location) in search results. This field is only considered if * `page_token` is unset. For example, 0 means to return results starting from @@ -44,12 +50,6 @@ class Google_Service_FactCheckTools_Resource_Claims extends Google_Service_Resou * results. Defaults to 10 if not set. * @opt_param string query Textual query string. Required unless * `review_publisher_site_filter` is specified. - * @opt_param string languageCode The BCP-47 language code, such as "en-US" or - * "sr-Latn". Can be used to restrict results by language, though we do not - * currently consider the region. - * @opt_param int maxAgeDays The maximum age of the returned search results, in - * days. Age is determined by either claim date or review date, whichever is - * newer. * @return Google_Service_FactCheckTools_GoogleFactcheckingFactchecktoolsV1alpha1FactCheckedClaimSearchResponse */ public function search($optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/FactCheckTools/Resource/Pages.php b/vendor/google/apiclient-services/src/Google/Service/FactCheckTools/Resource/Pages.php index 4145327..04c8dd9 100644 --- a/vendor/google/apiclient-services/src/Google/Service/FactCheckTools/Resource/Pages.php +++ b/vendor/google/apiclient-services/src/Google/Service/FactCheckTools/Resource/Pages.php @@ -72,14 +72,6 @@ class Google_Service_FactCheckTools_Resource_Pages extends Google_Service_Resour * * @param array $optParams Optional parameters. * - * @opt_param string organization The organization for which we want to fetch - * markups for. For instance, "site.com". Cannot be specified along with an URL. - * @opt_param int pageSize The pagination size. We will return up to that many - * results. Defaults to 10 if not set. Has no effect if a URL is requested. - * @opt_param string url The URL from which to get `ClaimReview` markup. There - * will be at most one result. If markup is associated with a more canonical - * version of the URL provided, we will return that URL instead. Cannot be - * specified along with an organization. * @opt_param int offset An integer that specifies the current offset (that is, * starting result location) in search results. This field is only considered if * `page_token` is unset, and if the request is not for a specific URL. For @@ -89,6 +81,14 @@ class Google_Service_FactCheckTools_Resource_Pages extends Google_Service_Resour * `next_page_token` returned from a previous List request, if any, in order to * get the next page. All other fields must have the same values as in the * previous request. + * @opt_param string organization The organization for which we want to fetch + * markups for. For instance, "site.com". Cannot be specified along with an URL. + * @opt_param int pageSize The pagination size. We will return up to that many + * results. Defaults to 10 if not set. Has no effect if a URL is requested. + * @opt_param string url The URL from which to get `ClaimReview` markup. There + * will be at most one result. If markup is associated with a more canonical + * version of the URL provided, we will return that URL instead. Cannot be + * specified along with an organization. * @return Google_Service_FactCheckTools_GoogleFactcheckingFactchecktoolsV1alpha1ListClaimReviewMarkupPagesResponse */ public function listPages($optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/FirebaseCloudMessaging/AndroidNotification.php b/vendor/google/apiclient-services/src/Google/Service/FirebaseCloudMessaging/AndroidNotification.php index c64c530..260e96b 100644 --- a/vendor/google/apiclient-services/src/Google/Service/FirebaseCloudMessaging/AndroidNotification.php +++ b/vendor/google/apiclient-services/src/Google/Service/FirebaseCloudMessaging/AndroidNotification.php @@ -17,20 +17,33 @@ class Google_Service_FirebaseCloudMessaging_AndroidNotification extends Google_Collection { - protected $collection_key = 'titleLocArgs'; + protected $collection_key = 'vibrateTimings'; public $body; public $bodyLocArgs; public $bodyLocKey; public $channelId; public $clickAction; public $color; + public $defaultLightSettings; + public $defaultSound; + public $defaultVibrateTimings; + public $eventTime; public $icon; public $image; + protected $lightSettingsType = 'Google_Service_FirebaseCloudMessaging_LightSettings'; + protected $lightSettingsDataType = ''; + public $localOnly; + public $notificationCount; + public $notificationPriority; public $sound; + public $sticky; public $tag; + public $ticker; public $title; public $titleLocArgs; public $titleLocKey; + public $vibrateTimings; + public $visibility; public function setBody($body) { @@ -80,6 +93,38 @@ class Google_Service_FirebaseCloudMessaging_AndroidNotification extends Google_C { return $this->color; } + public function setDefaultLightSettings($defaultLightSettings) + { + $this->defaultLightSettings = $defaultLightSettings; + } + public function getDefaultLightSettings() + { + return $this->defaultLightSettings; + } + public function setDefaultSound($defaultSound) + { + $this->defaultSound = $defaultSound; + } + public function getDefaultSound() + { + return $this->defaultSound; + } + public function setDefaultVibrateTimings($defaultVibrateTimings) + { + $this->defaultVibrateTimings = $defaultVibrateTimings; + } + public function getDefaultVibrateTimings() + { + return $this->defaultVibrateTimings; + } + public function setEventTime($eventTime) + { + $this->eventTime = $eventTime; + } + public function getEventTime() + { + return $this->eventTime; + } public function setIcon($icon) { $this->icon = $icon; @@ -96,6 +141,44 @@ class Google_Service_FirebaseCloudMessaging_AndroidNotification extends Google_C { return $this->image; } + /** + * @param Google_Service_FirebaseCloudMessaging_LightSettings + */ + public function setLightSettings(Google_Service_FirebaseCloudMessaging_LightSettings $lightSettings) + { + $this->lightSettings = $lightSettings; + } + /** + * @return Google_Service_FirebaseCloudMessaging_LightSettings + */ + public function getLightSettings() + { + return $this->lightSettings; + } + public function setLocalOnly($localOnly) + { + $this->localOnly = $localOnly; + } + public function getLocalOnly() + { + return $this->localOnly; + } + public function setNotificationCount($notificationCount) + { + $this->notificationCount = $notificationCount; + } + public function getNotificationCount() + { + return $this->notificationCount; + } + public function setNotificationPriority($notificationPriority) + { + $this->notificationPriority = $notificationPriority; + } + public function getNotificationPriority() + { + return $this->notificationPriority; + } public function setSound($sound) { $this->sound = $sound; @@ -104,6 +187,14 @@ class Google_Service_FirebaseCloudMessaging_AndroidNotification extends Google_C { return $this->sound; } + public function setSticky($sticky) + { + $this->sticky = $sticky; + } + public function getSticky() + { + return $this->sticky; + } public function setTag($tag) { $this->tag = $tag; @@ -112,6 +203,14 @@ class Google_Service_FirebaseCloudMessaging_AndroidNotification extends Google_C { return $this->tag; } + public function setTicker($ticker) + { + $this->ticker = $ticker; + } + public function getTicker() + { + return $this->ticker; + } public function setTitle($title) { $this->title = $title; @@ -136,4 +235,20 @@ class Google_Service_FirebaseCloudMessaging_AndroidNotification extends Google_C { return $this->titleLocKey; } + public function setVibrateTimings($vibrateTimings) + { + $this->vibrateTimings = $vibrateTimings; + } + public function getVibrateTimings() + { + return $this->vibrateTimings; + } + public function setVisibility($visibility) + { + $this->visibility = $visibility; + } + public function getVisibility() + { + return $this->visibility; + } } diff --git a/vendor/google/apiclient-services/src/Google/Service/FirebaseCloudMessaging/Color.php b/vendor/google/apiclient-services/src/Google/Service/FirebaseCloudMessaging/Color.php new file mode 100644 index 0000000..eb3568d --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/FirebaseCloudMessaging/Color.php @@ -0,0 +1,57 @@ +alpha = $alpha; + } + public function getAlpha() + { + return $this->alpha; + } + public function setBlue($blue) + { + $this->blue = $blue; + } + public function getBlue() + { + return $this->blue; + } + public function setGreen($green) + { + $this->green = $green; + } + public function getGreen() + { + return $this->green; + } + public function setRed($red) + { + $this->red = $red; + } + public function getRed() + { + return $this->red; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1ColorInfo.php b/vendor/google/apiclient-services/src/Google/Service/FirebaseCloudMessaging/LightSettings.php similarity index 51% rename from vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1ColorInfo.php rename to vendor/google/apiclient-services/src/Google/Service/FirebaseCloudMessaging/LightSettings.php index 2f5a457..b2487ee 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1ColorInfo.php +++ b/vendor/google/apiclient-services/src/Google/Service/FirebaseCloudMessaging/LightSettings.php @@ -15,41 +15,41 @@ * the License. */ -class Google_Service_Vision_GoogleCloudVisionV1p5beta1ColorInfo extends Google_Model +class Google_Service_FirebaseCloudMessaging_LightSettings extends Google_Model { - protected $colorType = 'Google_Service_Vision_Color'; + protected $colorType = 'Google_Service_FirebaseCloudMessaging_Color'; protected $colorDataType = ''; - public $pixelFraction; - public $score; + public $lightOffDuration; + public $lightOnDuration; /** - * @param Google_Service_Vision_Color + * @param Google_Service_FirebaseCloudMessaging_Color */ - public function setColor(Google_Service_Vision_Color $color) + public function setColor(Google_Service_FirebaseCloudMessaging_Color $color) { $this->color = $color; } /** - * @return Google_Service_Vision_Color + * @return Google_Service_FirebaseCloudMessaging_Color */ public function getColor() { return $this->color; } - public function setPixelFraction($pixelFraction) + public function setLightOffDuration($lightOffDuration) { - $this->pixelFraction = $pixelFraction; + $this->lightOffDuration = $lightOffDuration; } - public function getPixelFraction() + public function getLightOffDuration() { - return $this->pixelFraction; + return $this->lightOffDuration; } - public function setScore($score) + public function setLightOnDuration($lightOnDuration) { - $this->score = $score; + $this->lightOnDuration = $lightOnDuration; } - public function getScore() + public function getLightOnDuration() { - return $this->score; + return $this->lightOnDuration; } } diff --git a/vendor/google/apiclient-services/src/Google/Service/FirebaseManagement/Resource/Projects.php b/vendor/google/apiclient-services/src/Google/Service/FirebaseManagement/Resource/Projects.php index 1ddabe1..c37850e 100644 --- a/vendor/google/apiclient-services/src/Google/Service/FirebaseManagement/Resource/Projects.php +++ b/vendor/google/apiclient-services/src/Google/Service/FirebaseManagement/Resource/Projects.php @@ -73,17 +73,22 @@ class Google_Service_FirebaseManagement_Resource_Projects extends Google_Service * * Using this call, you can either: * - * Provision a new Google Analytics property and associate the new property with - * your `FirebaseProject`. Associate an existing Google Analytics property with - * your `FirebaseProject`. + * Specify an `analyticsAccountId` to provision a new Google Analytics property + * within the specified account and associate the new property with your + * `FirebaseProject`. Specify an existing `analyticsPropertyId` to associate the + * property with your `FirebaseProject`. * * Note that when you call `AddGoogleAnalytics`: * - * Any Firebase Apps already in your `FirebaseProject` are automatically - * provisioned as new data streams in the Google Analytics property. Any data - * streams already in the Google Analytics property are automatically associated - * with their corresponding Firebase Apps (only applies when an app's - * `packageName` or `bundleId` match those for an existing data stream). + * The first check determines if any existing data streams in the Google + * Analytics property correspond to any existing Firebase Apps in your + * `FirebaseProject` (based on the `packageName` or `bundleId` associated with + * the data stream). Then, as applicable, the data streams and apps are linked. + * Note that this auto-linking only applies to Android Apps and iOS Apps. If no + * corresponding data streams are found for your Firebase Apps, new data streams + * are provisioned in the Google Analytics property for each of your Firebase + * Apps. Note that a new data stream is always provisioned for a Web App even if + * it was previously associated with a data stream in your Analytics property. * * Learn more about the hierarchy and structure of Google Analytics accounts in * the [Analytics @@ -245,7 +250,9 @@ class Google_Service_FirebaseManagement_Resource_Projects extends Google_Service * * These resources may be re-associated later to the `FirebaseProject` by * calling [`AddGoogleAnalytics`](../../v1beta1/projects/addGoogleAnalytics) and - * specifying the same `analyticsPropertyId`. + * specifying the same `analyticsPropertyId`. For Android Apps and iOS Apps, + * this call re-links data streams with their corresponding apps. However, for + * Web Apps, this call provisions a new data stream for each Web App. * * To call `RemoveAnalytics`, a member must be an Owner for the * `FirebaseProject`. (projects.removeAnalytics) diff --git a/vendor/google/apiclient-services/src/Google/Service/FirebaseManagement/StreamMapping.php b/vendor/google/apiclient-services/src/Google/Service/FirebaseManagement/StreamMapping.php index 0dc259d..c127412 100644 --- a/vendor/google/apiclient-services/src/Google/Service/FirebaseManagement/StreamMapping.php +++ b/vendor/google/apiclient-services/src/Google/Service/FirebaseManagement/StreamMapping.php @@ -18,6 +18,7 @@ class Google_Service_FirebaseManagement_StreamMapping extends Google_Model { public $app; + public $measurementId; public $streamId; public function setApp($app) @@ -28,6 +29,14 @@ class Google_Service_FirebaseManagement_StreamMapping extends Google_Model { return $this->app; } + public function setMeasurementId($measurementId) + { + $this->measurementId = $measurementId; + } + public function getMeasurementId() + { + return $this->measurementId; + } public function setStreamId($streamId) { $this->streamId = $streamId; diff --git a/vendor/google/apiclient-services/src/Google/Service/FirebaseManagement/WebAppConfig.php b/vendor/google/apiclient-services/src/Google/Service/FirebaseManagement/WebAppConfig.php index 8485f36..ab94a5f 100644 --- a/vendor/google/apiclient-services/src/Google/Service/FirebaseManagement/WebAppConfig.php +++ b/vendor/google/apiclient-services/src/Google/Service/FirebaseManagement/WebAppConfig.php @@ -22,6 +22,7 @@ class Google_Service_FirebaseManagement_WebAppConfig extends Google_Model public $authDomain; public $databaseURL; public $locationId; + public $measurementId; public $messagingSenderId; public $projectId; public $storageBucket; @@ -66,6 +67,14 @@ class Google_Service_FirebaseManagement_WebAppConfig extends Google_Model { return $this->locationId; } + public function setMeasurementId($measurementId) + { + $this->measurementId = $measurementId; + } + public function getMeasurementId() + { + return $this->measurementId; + } public function setMessagingSenderId($messagingSenderId) { $this->messagingSenderId = $messagingSenderId; diff --git a/vendor/google/apiclient-services/src/Google/Service/FirebaseRules.php b/vendor/google/apiclient-services/src/Google/Service/FirebaseRules.php index b0aac06..810f4b1 100644 --- a/vendor/google/apiclient-services/src/Google/Service/FirebaseRules.php +++ b/vendor/google/apiclient-services/src/Google/Service/FirebaseRules.php @@ -139,10 +139,6 @@ class Google_Service_FirebaseRules extends Google_Service 'type' => 'string', 'required' => true, ), - 'pageSize' => array( - 'location' => 'query', - 'type' => 'integer', - ), 'filter' => array( 'location' => 'query', 'type' => 'string', @@ -151,6 +147,10 @@ class Google_Service_FirebaseRules extends Google_Service 'location' => 'query', 'type' => 'string', ), + 'pageSize' => array( + 'location' => 'query', + 'type' => 'integer', + ), ), ),'patch' => array( 'path' => 'v1/{+name}', @@ -211,10 +211,6 @@ class Google_Service_FirebaseRules extends Google_Service 'type' => 'string', 'required' => true, ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -223,6 +219,10 @@ class Google_Service_FirebaseRules extends Google_Service 'location' => 'query', 'type' => 'integer', ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ), ) diff --git a/vendor/google/apiclient-services/src/Google/Service/FirebaseRules/Resource/ProjectsReleases.php b/vendor/google/apiclient-services/src/Google/Service/FirebaseRules/Resource/ProjectsReleases.php index 62910fd..7081633 100644 --- a/vendor/google/apiclient-services/src/Google/Service/FirebaseRules/Resource/ProjectsReleases.php +++ b/vendor/google/apiclient-services/src/Google/Service/FirebaseRules/Resource/ProjectsReleases.php @@ -121,11 +121,6 @@ class Google_Service_FirebaseRules_Resource_ProjectsReleases extends Google_Serv * Format: `projects/{project_id}` * @param array $optParams Optional parameters. * - * @opt_param int pageSize Page size to load. Maximum of 100. Defaults to 10. - * Note: `page_size` is just a hint and the service may choose to load fewer - * than `page_size` results due to the size of the output. To traverse all of - * the releases, the caller should iterate until the `page_token` on the - * response is empty. * @opt_param string filter `Release` filter. The list method supports filters * with restrictions on the `Release.name`, `Release.ruleset_name`, and * `Release.test_suite_name`. @@ -153,6 +148,11 @@ class Google_Service_FirebaseRules_Resource_ProjectsReleases extends Google_Serv * `test_suite_name=projects/foo/testsuites/uuid1` * @opt_param string pageToken Next page token for the next batch of `Release` * instances. + * @opt_param int pageSize Page size to load. Maximum of 100. Defaults to 10. + * Note: `page_size` is just a hint and the service may choose to load fewer + * than `page_size` results due to the size of the output. To traverse all of + * the releases, the caller should iterate until the `page_token` on the + * response is empty. * @return Google_Service_FirebaseRules_ListReleasesResponse */ public function listProjectsReleases($name, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/FirebaseRules/Resource/ProjectsRulesets.php b/vendor/google/apiclient-services/src/Google/Service/FirebaseRules/Resource/ProjectsRulesets.php index 9bbf326..4cda451 100644 --- a/vendor/google/apiclient-services/src/Google/Service/FirebaseRules/Resource/ProjectsRulesets.php +++ b/vendor/google/apiclient-services/src/Google/Service/FirebaseRules/Resource/ProjectsRulesets.php @@ -91,6 +91,12 @@ class Google_Service_FirebaseRules_Resource_ProjectsRulesets extends Google_Serv * Format: `projects/{project_id}` * @param array $optParams Optional parameters. * + * @opt_param string pageToken Next page token for loading the next batch of + * `Ruleset` instances. + * @opt_param int pageSize Page size to load. Maximum of 100. Defaults to 10. + * Note: `page_size` is just a hint and the service may choose to load less than + * `page_size` due to the size of the output. To traverse all of the releases, + * caller should iterate until the `page_token` is empty. * @opt_param string filter `Ruleset` filter. The list method supports filters * with restrictions on `Ruleset.name`. * @@ -98,12 +104,6 @@ class Google_Service_FirebaseRules_Resource_ProjectsRulesets extends Google_Serv * strings that conform to the RFC 3339 date/time specifications. * * Example: `create_time > date("2017-01-01T00:00:00Z") AND name=UUID-*` - * @opt_param string pageToken Next page token for loading the next batch of - * `Ruleset` instances. - * @opt_param int pageSize Page size to load. Maximum of 100. Defaults to 10. - * Note: `page_size` is just a hint and the service may choose to load less than - * `page_size` due to the size of the output. To traverse all of the releases, - * caller should iterate until the `page_token` is empty. * @return Google_Service_FirebaseRules_ListRulesetsResponse */ public function listProjectsRulesets($name, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/FirebaseRules/TestCase.php b/vendor/google/apiclient-services/src/Google/Service/FirebaseRules/TestCase.php index 0fa7bb8..178602f 100644 --- a/vendor/google/apiclient-services/src/Google/Service/FirebaseRules/TestCase.php +++ b/vendor/google/apiclient-services/src/Google/Service/FirebaseRules/TestCase.php @@ -21,6 +21,7 @@ class Google_Service_FirebaseRules_TestCase extends Google_Collection public $expectation; protected $functionMocksType = 'Google_Service_FirebaseRules_FunctionMock'; protected $functionMocksDataType = 'array'; + public $pathEncoding; public $request; public $resource; @@ -46,6 +47,14 @@ class Google_Service_FirebaseRules_TestCase extends Google_Collection { return $this->functionMocks; } + public function setPathEncoding($pathEncoding) + { + $this->pathEncoding = $pathEncoding; + } + public function getPathEncoding() + { + return $this->pathEncoding; + } public function setRequest($request) { $this->request = $request; diff --git a/vendor/google/apiclient-services/src/Google/Service/Firestore.php b/vendor/google/apiclient-services/src/Google/Service/Firestore.php index 739eace..da06e61 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Firestore.php +++ b/vendor/google/apiclient-services/src/Google/Service/Firestore.php @@ -115,10 +115,6 @@ class Google_Service_Firestore extends Google_Service 'type' => 'string', 'required' => true, ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -127,6 +123,10 @@ class Google_Service_Firestore extends Google_Service 'location' => 'query', 'type' => 'integer', ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'patch' => array( 'path' => 'v1/{+name}', @@ -191,6 +191,10 @@ class Google_Service_Firestore extends Google_Service 'type' => 'string', 'required' => true, ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -199,10 +203,6 @@ class Google_Service_Firestore extends Google_Service 'location' => 'query', 'type' => 'integer', ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), ), ), ) @@ -258,15 +258,15 @@ class Google_Service_Firestore extends Google_Service 'type' => 'string', 'required' => true, ), + 'documentId' => array( + 'location' => 'query', + 'type' => 'string', + ), 'mask.fieldPaths' => array( 'location' => 'query', 'type' => 'string', 'repeated' => true, ), - 'documentId' => array( - 'location' => 'query', - 'type' => 'string', - ), ), ),'delete' => array( 'path' => 'v1/{+name}', @@ -295,10 +295,6 @@ class Google_Service_Firestore extends Google_Service 'type' => 'string', 'required' => true, ), - 'transaction' => array( - 'location' => 'query', - 'type' => 'string', - ), 'mask.fieldPaths' => array( 'location' => 'query', 'type' => 'string', @@ -308,6 +304,10 @@ class Google_Service_Firestore extends Google_Service 'location' => 'query', 'type' => 'string', ), + 'transaction' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'list' => array( 'path' => 'v1/{+parent}/{collectionId}', @@ -344,11 +344,11 @@ class Google_Service_Firestore extends Google_Service 'location' => 'query', 'type' => 'string', ), - 'orderBy' => array( + 'readTime' => array( 'location' => 'query', 'type' => 'string', ), - 'readTime' => array( + 'orderBy' => array( 'location' => 'query', 'type' => 'string', ), @@ -480,10 +480,6 @@ class Google_Service_Firestore extends Google_Service 'type' => 'string', 'required' => true, ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -492,6 +488,10 @@ class Google_Service_Firestore extends Google_Service 'location' => 'query', 'type' => 'integer', ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ), ) diff --git a/vendor/google/apiclient-services/src/Google/Service/Firestore/Resource/ProjectsDatabasesCollectionGroupsFields.php b/vendor/google/apiclient-services/src/Google/Service/Firestore/Resource/ProjectsDatabasesCollectionGroupsFields.php index 53faca6..d7d15f4 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Firestore/Resource/ProjectsDatabasesCollectionGroupsFields.php +++ b/vendor/google/apiclient-services/src/Google/Service/Firestore/Resource/ProjectsDatabasesCollectionGroupsFields.php @@ -52,13 +52,13 @@ class Google_Service_Firestore_Resource_ProjectsDatabasesCollectionGroupsFields * ses/{database_id}/collectionGroups/{collection_id}` * @param array $optParams Optional parameters. * + * @opt_param string pageToken A page token, returned from a previous call to + * FirestoreAdmin.ListFields, that may be used to get the next page of results. + * @opt_param int pageSize The number of results to return. * @opt_param string filter The filter to apply to list results. Currently, * FirestoreAdmin.ListFields only supports listing fields that have been * explicitly overridden. To issue this query, call FirestoreAdmin.ListFields * with the filter set to `indexConfig.usesAncestorConfig:false`. - * @opt_param string pageToken A page token, returned from a previous call to - * FirestoreAdmin.ListFields, that may be used to get the next page of results. - * @opt_param int pageSize The number of results to return. * @return Google_Service_Firestore_GoogleFirestoreAdminV1ListFieldsResponse */ public function listProjectsDatabasesCollectionGroupsFields($parent, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Firestore/Resource/ProjectsDatabasesCollectionGroupsIndexes.php b/vendor/google/apiclient-services/src/Google/Service/Firestore/Resource/ProjectsDatabasesCollectionGroupsIndexes.php index 0c75a37..b5302a8 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Firestore/Resource/ProjectsDatabasesCollectionGroupsIndexes.php +++ b/vendor/google/apiclient-services/src/Google/Service/Firestore/Resource/ProjectsDatabasesCollectionGroupsIndexes.php @@ -78,10 +78,10 @@ class Google_Service_Firestore_Resource_ProjectsDatabasesCollectionGroupsIndexes * ses/{database_id}/collectionGroups/{collection_id}` * @param array $optParams Optional parameters. * + * @opt_param string filter The filter to apply to list results. * @opt_param string pageToken A page token, returned from a previous call to * FirestoreAdmin.ListIndexes, that may be used to get the next page of results. * @opt_param int pageSize The number of results to return. - * @opt_param string filter The filter to apply to list results. * @return Google_Service_Firestore_GoogleFirestoreAdminV1ListIndexesResponse */ public function listProjectsDatabasesCollectionGroupsIndexes($parent, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Firestore/Resource/ProjectsDatabasesDocuments.php b/vendor/google/apiclient-services/src/Google/Service/Firestore/Resource/ProjectsDatabasesDocuments.php index ffdaef8..7178127 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Firestore/Resource/ProjectsDatabasesDocuments.php +++ b/vendor/google/apiclient-services/src/Google/Service/Firestore/Resource/ProjectsDatabasesDocuments.php @@ -85,12 +85,12 @@ class Google_Service_Firestore_Resource_ProjectsDatabasesDocuments extends Googl * @param Google_Service_Firestore_Document $postBody * @param array $optParams Optional parameters. * - * @opt_param string mask.fieldPaths The list of field paths in the mask. See - * Document.fields for a field path syntax reference. * @opt_param string documentId The client-assigned document ID to use for this * document. * * Optional. If not specified, an ID will be assigned by the service. + * @opt_param string mask.fieldPaths The list of field paths in the mask. See + * Document.fields for a field path syntax reference. * @return Google_Service_Firestore_Document */ public function createDocument($parent, $collectionId, Google_Service_Firestore_Document $postBody, $optParams = array()) @@ -126,11 +126,11 @@ class Google_Service_Firestore_Resource_ProjectsDatabasesDocuments extends Googl * `projects/{project_id}/databases/{database_id}/documents/{document_path}`. * @param array $optParams Optional parameters. * - * @opt_param string transaction Reads the document in a transaction. * @opt_param string mask.fieldPaths The list of field paths in the mask. See * Document.fields for a field path syntax reference. * @opt_param string readTime Reads the version of the document at the given * time. This may not be older than 60 seconds. + * @opt_param string transaction Reads the document in a transaction. * @return Google_Service_Firestore_Document */ public function get($name, $optParams = array()) @@ -163,10 +163,10 @@ class Google_Service_Firestore_Resource_ProjectsDatabasesDocuments extends Googl * previous List request, if any. * @opt_param int pageSize The maximum number of documents to return. * @opt_param string transaction Reads documents in a transaction. - * @opt_param string orderBy The order to sort results by. For example: - * `priority desc, name`. * @opt_param string readTime Reads documents as they were at the given time. * This may not be older than 60 seconds. + * @opt_param string orderBy The order to sort results by. For example: + * `priority desc, name`. * @return Google_Service_Firestore_ListDocumentsResponse */ public function listProjectsDatabasesDocuments($parent, $collectionId, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Firestore/Resource/ProjectsDatabasesOperations.php b/vendor/google/apiclient-services/src/Google/Service/Firestore/Resource/ProjectsDatabasesOperations.php index 6685076..54ac805 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Firestore/Resource/ProjectsDatabasesOperations.php +++ b/vendor/google/apiclient-services/src/Google/Service/Firestore/Resource/ProjectsDatabasesOperations.php @@ -94,9 +94,9 @@ class Google_Service_Firestore_Resource_ProjectsDatabasesOperations extends Goog * @param string $name The name of the operation's parent resource. * @param array $optParams Optional parameters. * - * @opt_param string filter The standard list filter. * @opt_param string pageToken The standard list page token. * @opt_param int pageSize The standard list page size. + * @opt_param string filter The standard list filter. * @return Google_Service_Firestore_GoogleLongrunningListOperationsResponse */ public function listProjectsDatabasesOperations($name, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Fitness.php b/vendor/google/apiclient-services/src/Google/Service/Fitness.php index 775974f..9b587c5 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Fitness.php +++ b/vendor/google/apiclient-services/src/Google/Service/Fitness.php @@ -30,58 +30,58 @@ */ class Google_Service_Fitness extends Google_Service { - /** View your activity information in Google Fit. */ + /** Use Google Fit to see and store your physical activity data. */ const FITNESS_ACTIVITY_READ = "https://www.googleapis.com/auth/fitness.activity.read"; - /** View and store your activity information in Google Fit. */ + /** See and add to your Google Fit physical activity data. */ const FITNESS_ACTIVITY_WRITE = "https://www.googleapis.com/auth/fitness.activity.write"; - /** View blood glucose data in Google Fit. */ + /** See info about your blood glucose in Google Fit. */ const FITNESS_BLOOD_GLUCOSE_READ = "https://www.googleapis.com/auth/fitness.blood_glucose.read"; - /** View and store blood glucose data in Google Fit. */ + /** See and add info about your blood glucose to Google Fit. */ const FITNESS_BLOOD_GLUCOSE_WRITE = "https://www.googleapis.com/auth/fitness.blood_glucose.write"; - /** View blood pressure data in Google Fit. */ + /** See info about your blood pressure in Google Fit. */ const FITNESS_BLOOD_PRESSURE_READ = "https://www.googleapis.com/auth/fitness.blood_pressure.read"; - /** View and store blood pressure data in Google Fit. */ + /** See and add info about your blood pressure in Google Fit. */ const FITNESS_BLOOD_PRESSURE_WRITE = "https://www.googleapis.com/auth/fitness.blood_pressure.write"; - /** View body sensor information in Google Fit. */ + /** See info about your body measurements and heart rate in Google Fit. */ const FITNESS_BODY_READ = "https://www.googleapis.com/auth/fitness.body.read"; - /** View and store body sensor data in Google Fit. */ + /** See and add info about your body measurements and heart rate to Google Fit. */ const FITNESS_BODY_WRITE = "https://www.googleapis.com/auth/fitness.body.write"; - /** View body temperature data in Google Fit. */ + /** See info about your body temperature in Google Fit. */ const FITNESS_BODY_TEMPERATURE_READ = "https://www.googleapis.com/auth/fitness.body_temperature.read"; - /** View and store body temperature data in Google Fit. */ + /** See and add to info about your body temperature in Google Fit. */ const FITNESS_BODY_TEMPERATURE_WRITE = "https://www.googleapis.com/auth/fitness.body_temperature.write"; - /** View your stored location data in Google Fit. */ + /** See your Google Fit speed and distance data. */ const FITNESS_LOCATION_READ = "https://www.googleapis.com/auth/fitness.location.read"; - /** View and store your location data in Google Fit. */ + /** See and add to your Google Fit location data. */ const FITNESS_LOCATION_WRITE = "https://www.googleapis.com/auth/fitness.location.write"; - /** View nutrition information in Google Fit. */ + /** See info about your nutrition in Google Fit. */ const FITNESS_NUTRITION_READ = "https://www.googleapis.com/auth/fitness.nutrition.read"; - /** View and store nutrition information in Google Fit. */ + /** See and add to info about your nutrition in Google Fit. */ const FITNESS_NUTRITION_WRITE = "https://www.googleapis.com/auth/fitness.nutrition.write"; - /** View oxygen saturation data in Google Fit. */ + /** See info about your oxygen saturation in Google Fit. */ const FITNESS_OXYGEN_SATURATION_READ = "https://www.googleapis.com/auth/fitness.oxygen_saturation.read"; - /** View and store oxygen saturation data in Google Fit. */ + /** See and add info about your oxygen saturation in Google Fit. */ const FITNESS_OXYGEN_SATURATION_WRITE = "https://www.googleapis.com/auth/fitness.oxygen_saturation.write"; - /** View reproductive health data in Google Fit. */ + /** See info about your reproductive health in Google Fit. */ const FITNESS_REPRODUCTIVE_HEALTH_READ = "https://www.googleapis.com/auth/fitness.reproductive_health.read"; - /** View and store reproductive health data in Google Fit. */ + /** See and add info about your reproductive health in Google Fit. */ const FITNESS_REPRODUCTIVE_HEALTH_WRITE = "https://www.googleapis.com/auth/fitness.reproductive_health.write"; diff --git a/vendor/google/apiclient-services/src/Google/Service/HomeGraphService.php b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService.php new file mode 100644 index 0000000..83a93dd --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService.php @@ -0,0 +1,104 @@ + +

+ * + *

+ * For more information about this service, see the API + * Documentation + *

+ * + * @author Google, Inc. + */ +class Google_Service_HomeGraphService extends Google_Service +{ + + + public $agentUsers; + public $devices; + + /** + * Constructs the internal representation of the HomeGraphService service. + * + * @param Google_Client $client The client used to deliver requests. + * @param string $rootUrl The root URL used for requests to the service. + */ + public function __construct(Google_Client $client, $rootUrl = null) + { + parent::__construct($client); + $this->rootUrl = $rootUrl ?: 'https://homegraph.googleapis.com/'; + $this->servicePath = ''; + $this->batchPath = 'batch'; + $this->version = 'v1'; + $this->serviceName = 'homegraph'; + + $this->agentUsers = new Google_Service_HomeGraphService_Resource_AgentUsers( + $this, + $this->serviceName, + 'agentUsers', + array( + 'methods' => array( + 'delete' => array( + 'path' => 'v1/{+agentUserId}', + 'httpMethod' => 'DELETE', + 'parameters' => array( + 'agentUserId' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'requestId' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ), + ) + ) + ); + $this->devices = new Google_Service_HomeGraphService_Resource_Devices( + $this, + $this->serviceName, + 'devices', + array( + 'methods' => array( + 'query' => array( + 'path' => 'v1/devices:query', + 'httpMethod' => 'POST', + 'parameters' => array(), + ),'reportStateAndNotification' => array( + 'path' => 'v1/devices:reportStateAndNotification', + 'httpMethod' => 'POST', + 'parameters' => array(), + ),'requestSync' => array( + 'path' => 'v1/devices:requestSync', + 'httpMethod' => 'POST', + 'parameters' => array(), + ),'sync' => array( + 'path' => 'v1/devices:sync', + 'httpMethod' => 'POST', + 'parameters' => array(), + ), + ) + ) + ); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/AgentDeviceId.php b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/AgentDeviceId.php new file mode 100644 index 0000000..cdae7c3 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/AgentDeviceId.php @@ -0,0 +1,30 @@ +id = $id; + } + public function getId() + { + return $this->id; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/AgentOtherDeviceId.php b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/AgentOtherDeviceId.php new file mode 100644 index 0000000..61d05e0 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/AgentOtherDeviceId.php @@ -0,0 +1,39 @@ +agentId = $agentId; + } + public function getAgentId() + { + return $this->agentId; + } + public function setDeviceId($deviceId) + { + $this->deviceId = $deviceId; + } + public function getDeviceId() + { + return $this->deviceId; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/Device.php b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/Device.php new file mode 100644 index 0000000..a92f929 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/Device.php @@ -0,0 +1,142 @@ +attributes = $attributes; + } + public function getAttributes() + { + return $this->attributes; + } + public function setCustomData($customData) + { + $this->customData = $customData; + } + public function getCustomData() + { + return $this->customData; + } + /** + * @param Google_Service_HomeGraphService_DeviceInfo + */ + public function setDeviceInfo(Google_Service_HomeGraphService_DeviceInfo $deviceInfo) + { + $this->deviceInfo = $deviceInfo; + } + /** + * @return Google_Service_HomeGraphService_DeviceInfo + */ + public function getDeviceInfo() + { + return $this->deviceInfo; + } + public function setId($id) + { + $this->id = $id; + } + public function getId() + { + return $this->id; + } + /** + * @param Google_Service_HomeGraphService_DeviceNames + */ + public function setName(Google_Service_HomeGraphService_DeviceNames $name) + { + $this->name = $name; + } + /** + * @return Google_Service_HomeGraphService_DeviceNames + */ + public function getName() + { + return $this->name; + } + /** + * @param Google_Service_HomeGraphService_AgentOtherDeviceId + */ + public function setOtherDeviceIds($otherDeviceIds) + { + $this->otherDeviceIds = $otherDeviceIds; + } + /** + * @return Google_Service_HomeGraphService_AgentOtherDeviceId + */ + public function getOtherDeviceIds() + { + return $this->otherDeviceIds; + } + public function setRoomHint($roomHint) + { + $this->roomHint = $roomHint; + } + public function getRoomHint() + { + return $this->roomHint; + } + public function setStructureHint($structureHint) + { + $this->structureHint = $structureHint; + } + public function getStructureHint() + { + return $this->structureHint; + } + public function setTraits($traits) + { + $this->traits = $traits; + } + public function getTraits() + { + return $this->traits; + } + public function setType($type) + { + $this->type = $type; + } + public function getType() + { + return $this->type; + } + public function setWillReportState($willReportState) + { + $this->willReportState = $willReportState; + } + public function getWillReportState() + { + return $this->willReportState; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/DeviceInfo.php b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/DeviceInfo.php new file mode 100644 index 0000000..ef6583d --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/DeviceInfo.php @@ -0,0 +1,57 @@ +hwVersion = $hwVersion; + } + public function getHwVersion() + { + return $this->hwVersion; + } + public function setManufacturer($manufacturer) + { + $this->manufacturer = $manufacturer; + } + public function getManufacturer() + { + return $this->manufacturer; + } + public function setModel($model) + { + $this->model = $model; + } + public function getModel() + { + return $this->model; + } + public function setSwVersion($swVersion) + { + $this->swVersion = $swVersion; + } + public function getSwVersion() + { + return $this->swVersion; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/DeviceNames.php b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/DeviceNames.php new file mode 100644 index 0000000..83ce84e --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/DeviceNames.php @@ -0,0 +1,49 @@ +defaultNames = $defaultNames; + } + public function getDefaultNames() + { + return $this->defaultNames; + } + public function setName($name) + { + $this->name = $name; + } + public function getName() + { + return $this->name; + } + public function setNicknames($nicknames) + { + $this->nicknames = $nicknames; + } + public function getNicknames() + { + return $this->nicknames; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Dataflow/DeleteSnapshotResponse.php b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/HomegraphEmpty.php similarity index 90% rename from vendor/google/apiclient-services/src/Google/Service/Dataflow/DeleteSnapshotResponse.php rename to vendor/google/apiclient-services/src/Google/Service/HomeGraphService/HomegraphEmpty.php index 7d6625c..fe6ee05 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Dataflow/DeleteSnapshotResponse.php +++ b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/HomegraphEmpty.php @@ -15,6 +15,6 @@ * the License. */ -class Google_Service_Dataflow_DeleteSnapshotResponse extends Google_Model +class Google_Service_HomeGraphService_HomegraphEmpty extends Google_Model { } diff --git a/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/QueryRequest.php b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/QueryRequest.php new file mode 100644 index 0000000..c970417 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/QueryRequest.php @@ -0,0 +1,56 @@ +agentUserId = $agentUserId; + } + public function getAgentUserId() + { + return $this->agentUserId; + } + /** + * @param Google_Service_HomeGraphService_QueryRequestInput + */ + public function setInputs($inputs) + { + $this->inputs = $inputs; + } + /** + * @return Google_Service_HomeGraphService_QueryRequestInput + */ + public function getInputs() + { + return $this->inputs; + } + public function setRequestId($requestId) + { + $this->requestId = $requestId; + } + public function getRequestId() + { + return $this->requestId; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/QueryRequestInput.php b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/QueryRequestInput.php new file mode 100644 index 0000000..8c1ce7e --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/QueryRequestInput.php @@ -0,0 +1,37 @@ +payload = $payload; + } + /** + * @return Google_Service_HomeGraphService_QueryRequestPayload + */ + public function getPayload() + { + return $this->payload; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/QueryRequestPayload.php b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/QueryRequestPayload.php new file mode 100644 index 0000000..0c19ee5 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/QueryRequestPayload.php @@ -0,0 +1,38 @@ +devices = $devices; + } + /** + * @return Google_Service_HomeGraphService_AgentDeviceId + */ + public function getDevices() + { + return $this->devices; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/QueryResponse.php b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/QueryResponse.php new file mode 100644 index 0000000..6ee976d --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/QueryResponse.php @@ -0,0 +1,46 @@ +payload = $payload; + } + /** + * @return Google_Service_HomeGraphService_QueryResponsePayload + */ + public function getPayload() + { + return $this->payload; + } + public function setRequestId($requestId) + { + $this->requestId = $requestId; + } + public function getRequestId() + { + return $this->requestId; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/QueryResponsePayload.php b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/QueryResponsePayload.php new file mode 100644 index 0000000..8b85083 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/QueryResponsePayload.php @@ -0,0 +1,30 @@ +devices = $devices; + } + public function getDevices() + { + return $this->devices; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/ReportStateAndNotificationDevice.php b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/ReportStateAndNotificationDevice.php new file mode 100644 index 0000000..149af1d --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/ReportStateAndNotificationDevice.php @@ -0,0 +1,39 @@ +notifications = $notifications; + } + public function getNotifications() + { + return $this->notifications; + } + public function setStates($states) + { + $this->states = $states; + } + public function getStates() + { + return $this->states; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/ReportStateAndNotificationRequest.php b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/ReportStateAndNotificationRequest.php new file mode 100644 index 0000000..6686516 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/ReportStateAndNotificationRequest.php @@ -0,0 +1,73 @@ +agentUserId = $agentUserId; + } + public function getAgentUserId() + { + return $this->agentUserId; + } + public function setEventId($eventId) + { + $this->eventId = $eventId; + } + public function getEventId() + { + return $this->eventId; + } + public function setFollowUpToken($followUpToken) + { + $this->followUpToken = $followUpToken; + } + public function getFollowUpToken() + { + return $this->followUpToken; + } + /** + * @param Google_Service_HomeGraphService_StateAndNotificationPayload + */ + public function setPayload(Google_Service_HomeGraphService_StateAndNotificationPayload $payload) + { + $this->payload = $payload; + } + /** + * @return Google_Service_HomeGraphService_StateAndNotificationPayload + */ + public function getPayload() + { + return $this->payload; + } + public function setRequestId($requestId) + { + $this->requestId = $requestId; + } + public function getRequestId() + { + return $this->requestId; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/ReportStateAndNotificationResponse.php b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/ReportStateAndNotificationResponse.php new file mode 100644 index 0000000..f158faa --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/ReportStateAndNotificationResponse.php @@ -0,0 +1,30 @@ +requestId = $requestId; + } + public function getRequestId() + { + return $this->requestId; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/RequestSyncDevicesRequest.php b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/RequestSyncDevicesRequest.php new file mode 100644 index 0000000..c228246 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/RequestSyncDevicesRequest.php @@ -0,0 +1,39 @@ +agentUserId = $agentUserId; + } + public function getAgentUserId() + { + return $this->agentUserId; + } + public function setAsync($async) + { + $this->async = $async; + } + public function getAsync() + { + return $this->async; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/RequestSyncDevicesResponse.php b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/RequestSyncDevicesResponse.php new file mode 100644 index 0000000..d7ac8bf --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/RequestSyncDevicesResponse.php @@ -0,0 +1,20 @@ + + * $homegraphService = new Google_Service_HomeGraphService(...); + * $agentUsers = $homegraphService->agentUsers; + * + */ +class Google_Service_HomeGraphService_Resource_AgentUsers extends Google_Service_Resource +{ + /** + * Unlinks an agent user from Google. As a result, all data related to this user + * will be deleted. + * + * Here is how the agent user is created in Google: + * + * 1. When a user opens their Google Home App, they can begin linking a 3p + * partner. 2. User is guided through the OAuth process. 3. After entering the + * 3p credentials, Google gets the 3p OAuth token and uses it to make a Sync + * call to the 3p partner and gets back all of the user's data, including + * `agent_user_id` and devices. 4. Google creates the agent user and stores a + * mapping from the `agent_user_id` -> Google ID mapping. Google also + * stores all of the user's devices under that Google ID. + * + * The mapping from `agent_user_id` to Google ID is many to many, since one + * Google user can have multiple 3p accounts, and multiple Google users can map + * to one `agent_user_id` (e.g., a husband and wife share one Nest account + * username/password). + * + * The third-party user's identity is passed in as `agent_user_id`. The agent is + * identified by the JWT signed by the partner's service account. + * + * Note: Special characters (except "/") in `agent_user_id` must be URL-encoded. + * (agentUsers.delete) + * + * @param string $agentUserId Required. Third-party user ID. + * @param array $optParams Optional parameters. + * + * @opt_param string requestId Request ID used for debugging. + * @return Google_Service_HomeGraphService_HomegraphEmpty + */ + public function delete($agentUserId, $optParams = array()) + { + $params = array('agentUserId' => $agentUserId); + $params = array_merge($params, $optParams); + return $this->call('delete', array($params), "Google_Service_HomeGraphService_HomegraphEmpty"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/Resource/Devices.php b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/Resource/Devices.php new file mode 100644 index 0000000..082d0b7 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/Resource/Devices.php @@ -0,0 +1,104 @@ + + * $homegraphService = new Google_Service_HomeGraphService(...); + * $devices = $homegraphService->devices; + * + */ +class Google_Service_HomeGraphService_Resource_Devices extends Google_Service_Resource +{ + /** + * Gets the device states for the devices in QueryRequest. The third-party + * user's identity is passed in as `agent_user_id`. The agent is identified by + * the JWT signed by the third-party partner's service account. (devices.query) + * + * @param Google_Service_HomeGraphService_QueryRequest $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_HomeGraphService_QueryResponse + */ + public function query(Google_Service_HomeGraphService_QueryRequest $postBody, $optParams = array()) + { + $params = array('postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('query', array($params), "Google_Service_HomeGraphService_QueryResponse"); + } + /** + * Reports device state and optionally sends device notifications. Called by an + * agent when the device state of a third-party changes or the agent wants to + * send a notification about the device. See [Implement Report + * State](/actions/smarthome/report-state) for more information. This method + * updates a predefined set of states for a device, which all devices have + * according to their prescribed traits (for example, a light will have the + * [OnOff](/actions/smarthome/traits/onoff) trait that reports the state `on` as + * a boolean value). A new state may not be created and an INVALID_ARGUMENT code + * will be thrown if so. It also optionally takes in a list of Notifications + * that may be created, which are associated to this state change. + * + * The third-party user's identity is passed in as `agent_user_id`. The agent is + * identified by the JWT signed by the partner's service account. + * (devices.reportStateAndNotification) + * + * @param Google_Service_HomeGraphService_ReportStateAndNotificationRequest $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_HomeGraphService_ReportStateAndNotificationResponse + */ + public function reportStateAndNotification(Google_Service_HomeGraphService_ReportStateAndNotificationRequest $postBody, $optParams = array()) + { + $params = array('postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('reportStateAndNotification', array($params), "Google_Service_HomeGraphService_ReportStateAndNotificationResponse"); + } + /** + * Requests a `SYNC` call from Google to a 3p partner's home control agent for a + * user. + * + * The third-party user's identity is passed in as `agent_user_id` (see + * RequestSyncDevicesRequest) and forwarded back to the agent. The agent is + * identified by the API key or JWT signed by the partner's service account. + * (devices.requestSync) + * + * @param Google_Service_HomeGraphService_RequestSyncDevicesRequest $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_HomeGraphService_RequestSyncDevicesResponse + */ + public function requestSync(Google_Service_HomeGraphService_RequestSyncDevicesRequest $postBody, $optParams = array()) + { + $params = array('postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('requestSync', array($params), "Google_Service_HomeGraphService_RequestSyncDevicesResponse"); + } + /** + * Gets all the devices associated with the given third-party user. The third- + * party user's identity is passed in as `agent_user_id`. The agent is + * identified by the JWT signed by the third-party partner's service account. + * (devices.sync) + * + * @param Google_Service_HomeGraphService_SyncRequest $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_HomeGraphService_SyncResponse + */ + public function sync(Google_Service_HomeGraphService_SyncRequest $postBody, $optParams = array()) + { + $params = array('postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('sync', array($params), "Google_Service_HomeGraphService_SyncResponse"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/StateAndNotificationPayload.php b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/StateAndNotificationPayload.php new file mode 100644 index 0000000..d8fdc9c --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/StateAndNotificationPayload.php @@ -0,0 +1,37 @@ +devices = $devices; + } + /** + * @return Google_Service_HomeGraphService_ReportStateAndNotificationDevice + */ + public function getDevices() + { + return $this->devices; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/SyncRequest.php b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/SyncRequest.php new file mode 100644 index 0000000..297b15c --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/SyncRequest.php @@ -0,0 +1,39 @@ +agentUserId = $agentUserId; + } + public function getAgentUserId() + { + return $this->agentUserId; + } + public function setRequestId($requestId) + { + $this->requestId = $requestId; + } + public function getRequestId() + { + return $this->requestId; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/SyncResponse.php b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/SyncResponse.php new file mode 100644 index 0000000..cf8d0bd --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/SyncResponse.php @@ -0,0 +1,46 @@ +payload = $payload; + } + /** + * @return Google_Service_HomeGraphService_SyncResponsePayload + */ + public function getPayload() + { + return $this->payload; + } + public function setRequestId($requestId) + { + $this->requestId = $requestId; + } + public function getRequestId() + { + return $this->requestId; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/SyncResponsePayload.php b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/SyncResponsePayload.php new file mode 100644 index 0000000..708c27c --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/HomeGraphService/SyncResponsePayload.php @@ -0,0 +1,47 @@ +agentUserId = $agentUserId; + } + public function getAgentUserId() + { + return $this->agentUserId; + } + /** + * @param Google_Service_HomeGraphService_Device + */ + public function setDevices($devices) + { + $this->devices = $devices; + } + /** + * @return Google_Service_HomeGraphService_Device + */ + public function getDevices() + { + return $this->devices; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Iam.php b/vendor/google/apiclient-services/src/Google/Service/Iam.php index e515f4e..ae626b9 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Iam.php +++ b/vendor/google/apiclient-services/src/Google/Service/Iam.php @@ -126,14 +126,6 @@ class Google_Service_Iam extends Google_Service 'type' => 'string', 'required' => true, ), - 'showDeleted' => array( - 'location' => 'query', - 'type' => 'boolean', - ), - 'pageToken' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageSize' => array( 'location' => 'query', 'type' => 'integer', @@ -142,6 +134,14 @@ class Google_Service_Iam extends Google_Service 'location' => 'query', 'type' => 'string', ), + 'showDeleted' => array( + 'location' => 'query', + 'type' => 'boolean', + ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'patch' => array( 'path' => 'v1/{+name}', @@ -234,14 +234,6 @@ class Google_Service_Iam extends Google_Service 'type' => 'string', 'required' => true, ), - 'showDeleted' => array( - 'location' => 'query', - 'type' => 'boolean', - ), - 'pageToken' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageSize' => array( 'location' => 'query', 'type' => 'integer', @@ -250,6 +242,14 @@ class Google_Service_Iam extends Google_Service 'location' => 'query', 'type' => 'string', ), + 'showDeleted' => array( + 'location' => 'query', + 'type' => 'boolean', + ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'patch' => array( 'path' => 'v1/{+name}', @@ -496,6 +496,16 @@ class Google_Service_Iam extends Google_Service 'repeated' => true, ), ), + ),'upload' => array( + 'path' => 'v1/{+name}/keys:upload', + 'httpMethod' => 'POST', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), ), ) ) diff --git a/vendor/google/apiclient-services/src/Google/Service/Iam/Resource/OrganizationsRoles.php b/vendor/google/apiclient-services/src/Google/Service/Iam/Resource/OrganizationsRoles.php index c5109b5..30e3002 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Iam/Resource/OrganizationsRoles.php +++ b/vendor/google/apiclient-services/src/Google/Service/Iam/Resource/OrganizationsRoles.php @@ -163,15 +163,15 @@ class Google_Service_Iam_Resource_OrganizationsRoles extends Google_Service_Reso * or organization ID. * @param array $optParams Optional parameters. * - * @opt_param bool showDeleted Include Roles that have been deleted. - * @opt_param string pageToken Optional pagination token returned in an earlier - * ListRolesResponse. * @opt_param int pageSize Optional limit on the number of roles to include in * the response. * @opt_param string view Optional view for the returned Role objects. When * `FULL` is specified, the `includedPermissions` field is returned, which * includes a list of all permissions in the role. The default value is `BASIC`, * which does not return the `includedPermissions` field. + * @opt_param bool showDeleted Include Roles that have been deleted. + * @opt_param string pageToken Optional pagination token returned in an earlier + * ListRolesResponse. * @return Google_Service_Iam_ListRolesResponse */ public function listOrganizationsRoles($parent, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Iam/Resource/ProjectsRoles.php b/vendor/google/apiclient-services/src/Google/Service/Iam/Resource/ProjectsRoles.php index e92a2d5..a161a4a 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Iam/Resource/ProjectsRoles.php +++ b/vendor/google/apiclient-services/src/Google/Service/Iam/Resource/ProjectsRoles.php @@ -163,15 +163,15 @@ class Google_Service_Iam_Resource_ProjectsRoles extends Google_Service_Resource * or organization ID. * @param array $optParams Optional parameters. * - * @opt_param bool showDeleted Include Roles that have been deleted. - * @opt_param string pageToken Optional pagination token returned in an earlier - * ListRolesResponse. * @opt_param int pageSize Optional limit on the number of roles to include in * the response. * @opt_param string view Optional view for the returned Role objects. When * `FULL` is specified, the `includedPermissions` field is returned, which * includes a list of all permissions in the role. The default value is `BASIC`, * which does not return the `includedPermissions` field. + * @opt_param bool showDeleted Include Roles that have been deleted. + * @opt_param string pageToken Optional pagination token returned in an earlier + * ListRolesResponse. * @return Google_Service_Iam_ListRolesResponse */ public function listProjectsRoles($parent, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Iam/Resource/ProjectsServiceAccounts.php b/vendor/google/apiclient-services/src/Google/Service/Iam/Resource/ProjectsServiceAccounts.php index 84424f9..2748cbe 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Iam/Resource/ProjectsServiceAccounts.php +++ b/vendor/google/apiclient-services/src/Google/Service/Iam/Resource/ProjectsServiceAccounts.php @@ -157,8 +157,14 @@ class Google_Service_Iam_Resource_ProjectsServiceAccounts extends Google_Service * @param array $optParams Optional parameters. * * @opt_param int options.requestedPolicyVersion Optional. The policy format - * version to be returned. Acceptable values are 0, 1, and 3. If the value is 0, - * or the field is omitted, policy format version 1 will be returned. + * version to be returned. + * + * Valid values are 0, 1, and 3. Requests specifying an invalid value will be + * rejected. + * + * Requests for policies with any conditional bindings must specify version 3. + * Policies without any conditional bindings may specify any valid value or + * leave the field unset. * @return Google_Service_Iam_Policy */ public function getIamPolicy($resource, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Iam/Resource/ProjectsServiceAccountsKeys.php b/vendor/google/apiclient-services/src/Google/Service/Iam/Resource/ProjectsServiceAccountsKeys.php index 8059078..7fc9578 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Iam/Resource/ProjectsServiceAccountsKeys.php +++ b/vendor/google/apiclient-services/src/Google/Service/Iam/Resource/ProjectsServiceAccountsKeys.php @@ -105,4 +105,24 @@ class Google_Service_Iam_Resource_ProjectsServiceAccountsKeys extends Google_Ser $params = array_merge($params, $optParams); return $this->call('list', array($params), "Google_Service_Iam_ListServiceAccountKeysResponse"); } + /** + * Upload public key for a given service account. This rpc will create a + * ServiceAccountKey that has the provided public key and returns it. + * (keys.upload) + * + * @param string $name The resource name of the service account in the following + * format: `projects/{PROJECT_ID}/serviceAccounts/{ACCOUNT}`. Using `-` as a + * wildcard for the `PROJECT_ID` will infer the project from the account. The + * `ACCOUNT` value can be the `email` address or the `unique_id` of the service + * account. + * @param Google_Service_Iam_UploadServiceAccountKeyRequest $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_Iam_ServiceAccountKey + */ + public function upload($name, Google_Service_Iam_UploadServiceAccountKeyRequest $postBody, $optParams = array()) + { + $params = array('name' => $name, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('upload', array($params), "Google_Service_Iam_ServiceAccountKey"); + } } diff --git a/vendor/google/apiclient-services/src/Google/Service/Iam/UploadServiceAccountKeyRequest.php b/vendor/google/apiclient-services/src/Google/Service/Iam/UploadServiceAccountKeyRequest.php new file mode 100644 index 0000000..f431921 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Iam/UploadServiceAccountKeyRequest.php @@ -0,0 +1,30 @@ +publicKeyData = $publicKeyData; + } + public function getPublicKeyData() + { + return $this->publicKeyData; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Libraryagent.php b/vendor/google/apiclient-services/src/Google/Service/Libraryagent.php index f3ab40d..f2377e8 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Libraryagent.php +++ b/vendor/google/apiclient-services/src/Google/Service/Libraryagent.php @@ -72,14 +72,14 @@ class Google_Service_Libraryagent extends Google_Service 'path' => 'v1/shelves', 'httpMethod' => 'GET', 'parameters' => array( - 'pageSize' => array( - 'location' => 'query', - 'type' => 'integer', - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', ), + 'pageSize' => array( + 'location' => 'query', + 'type' => 'integer', + ), ), ), ) @@ -120,14 +120,14 @@ class Google_Service_Libraryagent extends Google_Service 'type' => 'string', 'required' => true, ), - 'pageSize' => array( - 'location' => 'query', - 'type' => 'integer', - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', ), + 'pageSize' => array( + 'location' => 'query', + 'type' => 'integer', + ), ), ),'return' => array( 'path' => 'v1/{+name}:return', diff --git a/vendor/google/apiclient-services/src/Google/Service/Libraryagent/Resource/Shelves.php b/vendor/google/apiclient-services/src/Google/Service/Libraryagent/Resource/Shelves.php index 35684b9..c322e00 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Libraryagent/Resource/Shelves.php +++ b/vendor/google/apiclient-services/src/Google/Service/Libraryagent/Resource/Shelves.php @@ -28,7 +28,7 @@ class Google_Service_Libraryagent_Resource_Shelves extends Google_Service_Resour /** * Gets a shelf. Returns NOT_FOUND if the shelf does not exist. (shelves.get) * - * @param string $name The name of the shelf to retrieve. + * @param string $name Required. The name of the shelf to retrieve. * @param array $optParams Optional parameters. * @return Google_Service_Libraryagent_GoogleExampleLibraryagentV1Shelf */ @@ -45,12 +45,12 @@ class Google_Service_Libraryagent_Resource_Shelves extends Google_Service_Resour * * @param array $optParams Optional parameters. * - * @opt_param int pageSize Requested page size. Server may return fewer shelves - * than requested. If unspecified, server will pick an appropriate default. * @opt_param string pageToken A token identifying a page of results the server * should return. Typically, this is the value of * ListShelvesResponse.next_page_token returned from the previous call to * `ListShelves` method. + * @opt_param int pageSize Requested page size. Server may return fewer shelves + * than requested. If unspecified, server will pick an appropriate default. * @return Google_Service_Libraryagent_GoogleExampleLibraryagentV1ListShelvesResponse */ public function listShelves($optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Libraryagent/Resource/ShelvesBooks.php b/vendor/google/apiclient-services/src/Google/Service/Libraryagent/Resource/ShelvesBooks.php index 28479b6..7ce5ba4 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Libraryagent/Resource/ShelvesBooks.php +++ b/vendor/google/apiclient-services/src/Google/Service/Libraryagent/Resource/ShelvesBooks.php @@ -31,7 +31,7 @@ class Google_Service_Libraryagent_Resource_ShelvesBooks extends Google_Service_R * Returns quota exceeded error if the amount of books borrowed exceeds * allocation quota in any dimensions. (books.borrow) * - * @param string $name The name of the book to borrow. + * @param string $name Required. The name of the book to borrow. * @param array $optParams Optional parameters. * @return Google_Service_Libraryagent_GoogleExampleLibraryagentV1Book */ @@ -44,7 +44,7 @@ class Google_Service_Libraryagent_Resource_ShelvesBooks extends Google_Service_R /** * Gets a book. Returns NOT_FOUND if the book does not exist. (books.get) * - * @param string $name The name of the book to retrieve. + * @param string $name Required. The name of the book to retrieve. * @param array $optParams Optional parameters. * @return Google_Service_Libraryagent_GoogleExampleLibraryagentV1Book */ @@ -59,15 +59,16 @@ class Google_Service_Libraryagent_Resource_ShelvesBooks extends Google_Service_R * created books will not necessarily be added to the end of this list. Returns * NOT_FOUND if the shelf does not exist. (books.listShelvesBooks) * - * @param string $parent The name of the shelf whose books we'd like to list. + * @param string $parent Required. The name of the shelf whose books we'd like + * to list. * @param array $optParams Optional parameters. * - * @opt_param int pageSize Requested page size. Server may return fewer books - * than requested. If unspecified, server will pick an appropriate default. * @opt_param string pageToken A token identifying a page of results the server * should return. Typically, this is the value of * ListBooksResponse.next_page_token. returned from the previous call to * `ListBooks` method. + * @opt_param int pageSize Requested page size. Server may return fewer books + * than requested. If unspecified, server will pick an appropriate default. * @return Google_Service_Libraryagent_GoogleExampleLibraryagentV1ListBooksResponse */ public function listShelvesBooks($parent, $optParams = array()) @@ -81,7 +82,7 @@ class Google_Service_Libraryagent_Resource_ShelvesBooks extends Google_Service_R * library successfully. Returns error if the book does not belong to the * library or the users didn't borrow before. (books.returnShelvesBooks) * - * @param string $name The name of the book to return. + * @param string $name Required. The name of the book to return. * @param array $optParams Optional parameters. * @return Google_Service_Libraryagent_GoogleExampleLibraryagentV1Book */ diff --git a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Vertex.php b/vendor/google/apiclient-services/src/Google/Service/Logging/BigQueryOptions.php similarity index 67% rename from vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Vertex.php rename to vendor/google/apiclient-services/src/Google/Service/Logging/BigQueryOptions.php index 8bc5f3e..d8fd963 100644 --- a/vendor/google/apiclient-services/src/Google/Service/CloudHealthcare/Vertex.php +++ b/vendor/google/apiclient-services/src/Google/Service/Logging/BigQueryOptions.php @@ -15,25 +15,16 @@ * the License. */ -class Google_Service_CloudHealthcare_Vertex extends Google_Model +class Google_Service_Logging_BigQueryOptions extends Google_Model { - public $x; - public $y; + public $usePartitionedTables; - public function setX($x) + public function setUsePartitionedTables($usePartitionedTables) { - $this->x = $x; + $this->usePartitionedTables = $usePartitionedTables; } - public function getX() + public function getUsePartitionedTables() { - return $this->x; - } - public function setY($y) - { - $this->y = $y; - } - public function getY() - { - return $this->y; + return $this->usePartitionedTables; } } diff --git a/vendor/google/apiclient-services/src/Google/Service/Logging/LogSink.php b/vendor/google/apiclient-services/src/Google/Service/Logging/LogSink.php index 3fe2522..a16ffc7 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Logging/LogSink.php +++ b/vendor/google/apiclient-services/src/Google/Service/Logging/LogSink.php @@ -17,15 +17,33 @@ class Google_Service_Logging_LogSink extends Google_Model { + protected $bigqueryOptionsType = 'Google_Service_Logging_BigQueryOptions'; + protected $bigqueryOptionsDataType = ''; public $createTime; public $destination; + public $endTime; public $filter; public $includeChildren; public $name; public $outputVersionFormat; + public $startTime; public $updateTime; public $writerIdentity; + /** + * @param Google_Service_Logging_BigQueryOptions + */ + public function setBigqueryOptions(Google_Service_Logging_BigQueryOptions $bigqueryOptions) + { + $this->bigqueryOptions = $bigqueryOptions; + } + /** + * @return Google_Service_Logging_BigQueryOptions + */ + public function getBigqueryOptions() + { + return $this->bigqueryOptions; + } public function setCreateTime($createTime) { $this->createTime = $createTime; @@ -42,6 +60,14 @@ class Google_Service_Logging_LogSink extends Google_Model { return $this->destination; } + public function setEndTime($endTime) + { + $this->endTime = $endTime; + } + public function getEndTime() + { + return $this->endTime; + } public function setFilter($filter) { $this->filter = $filter; @@ -74,6 +100,14 @@ class Google_Service_Logging_LogSink extends Google_Model { return $this->outputVersionFormat; } + public function setStartTime($startTime) + { + $this->startTime = $startTime; + } + public function getStartTime() + { + return $this->startTime; + } public function setUpdateTime($updateTime) { $this->updateTime = $updateTime; diff --git a/vendor/google/apiclient-services/src/Google/Service/Logging/MetricDescriptor.php b/vendor/google/apiclient-services/src/Google/Service/Logging/MetricDescriptor.php index f2e515d..0f3d74c 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Logging/MetricDescriptor.php +++ b/vendor/google/apiclient-services/src/Google/Service/Logging/MetricDescriptor.php @@ -17,7 +17,7 @@ class Google_Service_Logging_MetricDescriptor extends Google_Collection { - protected $collection_key = 'labels'; + protected $collection_key = 'monitoredResourceTypes'; public $description; public $displayName; protected $labelsType = 'Google_Service_Logging_LabelDescriptor'; @@ -26,6 +26,7 @@ class Google_Service_Logging_MetricDescriptor extends Google_Collection protected $metadataType = 'Google_Service_Logging_MetricDescriptorMetadata'; protected $metadataDataType = ''; public $metricKind; + public $monitoredResourceTypes; public $name; public $type; public $unit; @@ -91,6 +92,14 @@ class Google_Service_Logging_MetricDescriptor extends Google_Collection { return $this->metricKind; } + public function setMonitoredResourceTypes($monitoredResourceTypes) + { + $this->monitoredResourceTypes = $monitoredResourceTypes; + } + public function getMonitoredResourceTypes() + { + return $this->monitoredResourceTypes; + } public function setName($name) { $this->name = $name; diff --git a/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/BillingAccountsExclusions.php b/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/BillingAccountsExclusions.php index 56bb730..aeccb01 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/BillingAccountsExclusions.php +++ b/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/BillingAccountsExclusions.php @@ -116,8 +116,8 @@ class Google_Service_Logging_Resource_BillingAccountsExclusions extends Google_S * @param Google_Service_Logging_LogExclusion $postBody * @param array $optParams Optional parameters. * - * @opt_param string updateMask Required. A nonempty list of fields to change in - * the existing exclusion. New values for the fields are taken from the + * @opt_param string updateMask Required. A non-empty list of fields to change + * in the existing exclusion. New values for the fields are taken from the * corresponding fields in the LogExclusion included in this request. Fields not * mentioned in update_mask are not changed and are ignored in the request.For * example, to change the filter and description of an exclusion, specify an diff --git a/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/BillingAccountsLogs.php b/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/BillingAccountsLogs.php index 9b1607e..3d6592b 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/BillingAccountsLogs.php +++ b/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/BillingAccountsLogs.php @@ -28,7 +28,8 @@ class Google_Service_Logging_Resource_BillingAccountsLogs extends Google_Service /** * Deletes all the log entries in a log. The log reappears if it receives new * entries. Log entries written shortly before the delete operation might not be - * deleted. (logs.delete) + * deleted. Entries received after the delete operation with a timestamp before + * the operation will be deleted. (logs.delete) * * @param string $logName Required. The resource name of the log to delete: * "projects/[PROJECT_ID]/logs/[LOG_ID]" diff --git a/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/Exclusions.php b/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/Exclusions.php index caf455c..ee57273 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/Exclusions.php +++ b/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/Exclusions.php @@ -115,8 +115,8 @@ class Google_Service_Logging_Resource_Exclusions extends Google_Service_Resource * @param Google_Service_Logging_LogExclusion $postBody * @param array $optParams Optional parameters. * - * @opt_param string updateMask Required. A nonempty list of fields to change in - * the existing exclusion. New values for the fields are taken from the + * @opt_param string updateMask Required. A non-empty list of fields to change + * in the existing exclusion. New values for the fields are taken from the * corresponding fields in the LogExclusion included in this request. Fields not * mentioned in update_mask are not changed and are ignored in the request.For * example, to change the filter and description of an exclusion, specify an diff --git a/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/FoldersExclusions.php b/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/FoldersExclusions.php index 8a7f656..98d38db 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/FoldersExclusions.php +++ b/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/FoldersExclusions.php @@ -116,8 +116,8 @@ class Google_Service_Logging_Resource_FoldersExclusions extends Google_Service_R * @param Google_Service_Logging_LogExclusion $postBody * @param array $optParams Optional parameters. * - * @opt_param string updateMask Required. A nonempty list of fields to change in - * the existing exclusion. New values for the fields are taken from the + * @opt_param string updateMask Required. A non-empty list of fields to change + * in the existing exclusion. New values for the fields are taken from the * corresponding fields in the LogExclusion included in this request. Fields not * mentioned in update_mask are not changed and are ignored in the request.For * example, to change the filter and description of an exclusion, specify an diff --git a/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/FoldersLogs.php b/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/FoldersLogs.php index 6d89173..17ed327 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/FoldersLogs.php +++ b/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/FoldersLogs.php @@ -28,7 +28,8 @@ class Google_Service_Logging_Resource_FoldersLogs extends Google_Service_Resourc /** * Deletes all the log entries in a log. The log reappears if it receives new * entries. Log entries written shortly before the delete operation might not be - * deleted. (logs.delete) + * deleted. Entries received after the delete operation with a timestamp before + * the operation will be deleted. (logs.delete) * * @param string $logName Required. The resource name of the log to delete: * "projects/[PROJECT_ID]/logs/[LOG_ID]" diff --git a/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/Logs.php b/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/Logs.php index b11097f..7885982 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/Logs.php +++ b/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/Logs.php @@ -28,7 +28,8 @@ class Google_Service_Logging_Resource_Logs extends Google_Service_Resource /** * Deletes all the log entries in a log. The log reappears if it receives new * entries. Log entries written shortly before the delete operation might not be - * deleted. (logs.delete) + * deleted. Entries received after the delete operation with a timestamp before + * the operation will be deleted. (logs.delete) * * @param string $logName Required. The resource name of the log to delete: * "projects/[PROJECT_ID]/logs/[LOG_ID]" diff --git a/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/OrganizationsExclusions.php b/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/OrganizationsExclusions.php index 4b1c0ea..acbaba9 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/OrganizationsExclusions.php +++ b/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/OrganizationsExclusions.php @@ -116,8 +116,8 @@ class Google_Service_Logging_Resource_OrganizationsExclusions extends Google_Ser * @param Google_Service_Logging_LogExclusion $postBody * @param array $optParams Optional parameters. * - * @opt_param string updateMask Required. A nonempty list of fields to change in - * the existing exclusion. New values for the fields are taken from the + * @opt_param string updateMask Required. A non-empty list of fields to change + * in the existing exclusion. New values for the fields are taken from the * corresponding fields in the LogExclusion included in this request. Fields not * mentioned in update_mask are not changed and are ignored in the request.For * example, to change the filter and description of an exclusion, specify an diff --git a/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/OrganizationsLogs.php b/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/OrganizationsLogs.php index 37c3239..2d3e75a 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/OrganizationsLogs.php +++ b/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/OrganizationsLogs.php @@ -28,7 +28,8 @@ class Google_Service_Logging_Resource_OrganizationsLogs extends Google_Service_R /** * Deletes all the log entries in a log. The log reappears if it receives new * entries. Log entries written shortly before the delete operation might not be - * deleted. (logs.delete) + * deleted. Entries received after the delete operation with a timestamp before + * the operation will be deleted. (logs.delete) * * @param string $logName Required. The resource name of the log to delete: * "projects/[PROJECT_ID]/logs/[LOG_ID]" diff --git a/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/ProjectsExclusions.php b/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/ProjectsExclusions.php index 76875bd..a3e4e4e 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/ProjectsExclusions.php +++ b/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/ProjectsExclusions.php @@ -116,8 +116,8 @@ class Google_Service_Logging_Resource_ProjectsExclusions extends Google_Service_ * @param Google_Service_Logging_LogExclusion $postBody * @param array $optParams Optional parameters. * - * @opt_param string updateMask Required. A nonempty list of fields to change in - * the existing exclusion. New values for the fields are taken from the + * @opt_param string updateMask Required. A non-empty list of fields to change + * in the existing exclusion. New values for the fields are taken from the * corresponding fields in the LogExclusion included in this request. Fields not * mentioned in update_mask are not changed and are ignored in the request.For * example, to change the filter and description of an exclusion, specify an diff --git a/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/ProjectsLogs.php b/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/ProjectsLogs.php index 39c6b55..baf52dd 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/ProjectsLogs.php +++ b/vendor/google/apiclient-services/src/Google/Service/Logging/Resource/ProjectsLogs.php @@ -28,7 +28,8 @@ class Google_Service_Logging_Resource_ProjectsLogs extends Google_Service_Resour /** * Deletes all the log entries in a log. The log reappears if it receives new * entries. Log entries written shortly before the delete operation might not be - * deleted. (logs.delete) + * deleted. Entries received after the delete operation with a timestamp before + * the operation will be deleted. (logs.delete) * * @param string $logName Required. The resource name of the log to delete: * "projects/[PROJECT_ID]/logs/[LOG_ID]" diff --git a/vendor/google/apiclient-services/src/Google/Service/Monitoring.php b/vendor/google/apiclient-services/src/Google/Service/Monitoring.php index af7b74b..3bc05b0 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Monitoring.php +++ b/vendor/google/apiclient-services/src/Google/Service/Monitoring.php @@ -120,6 +120,10 @@ class Google_Service_Monitoring extends Google_Service 'type' => 'string', 'required' => true, ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), 'orderBy' => array( 'location' => 'query', 'type' => 'string', @@ -132,10 +136,6 @@ class Google_Service_Monitoring extends Google_Service 'location' => 'query', 'type' => 'integer', ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), ), ),'patch' => array( 'path' => 'v3/{+name}', @@ -228,6 +228,14 @@ class Google_Service_Monitoring extends Google_Service 'type' => 'string', 'required' => true, ), + 'pageSize' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'ancestorsOfGroup' => array( + 'location' => 'query', + 'type' => 'string', + ), 'childrenOfGroup' => array( 'location' => 'query', 'type' => 'string', @@ -240,14 +248,6 @@ class Google_Service_Monitoring extends Google_Service 'location' => 'query', 'type' => 'string', ), - 'pageSize' => array( - 'location' => 'query', - 'type' => 'integer', - ), - 'ancestorsOfGroup' => array( - 'location' => 'query', - 'type' => 'string', - ), ), ),'update' => array( 'path' => 'v3/{+name}', @@ -294,14 +294,14 @@ class Google_Service_Monitoring extends Google_Service 'location' => 'query', 'type' => 'string', ), - 'interval.startTime' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageSize' => array( 'location' => 'query', 'type' => 'integer', ), + 'interval.startTime' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ), ) @@ -352,6 +352,10 @@ class Google_Service_Monitoring extends Google_Service 'type' => 'string', 'required' => true, ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -360,10 +364,6 @@ class Google_Service_Monitoring extends Google_Service 'location' => 'query', 'type' => 'integer', ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), ), ), ) @@ -394,10 +394,6 @@ class Google_Service_Monitoring extends Google_Service 'type' => 'string', 'required' => true, ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -406,6 +402,10 @@ class Google_Service_Monitoring extends Google_Service 'location' => 'query', 'type' => 'integer', ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ), ) @@ -508,10 +508,6 @@ class Google_Service_Monitoring extends Google_Service 'type' => 'string', 'required' => true, ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), 'orderBy' => array( 'location' => 'query', 'type' => 'string', @@ -524,6 +520,10 @@ class Google_Service_Monitoring extends Google_Service 'location' => 'query', 'type' => 'integer', ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'patch' => array( 'path' => 'v3/{+name}', @@ -588,10 +588,6 @@ class Google_Service_Monitoring extends Google_Service 'type' => 'string', 'required' => true, ), - 'view' => array( - 'location' => 'query', - 'type' => 'string', - ), 'aggregation.groupByFields' => array( 'location' => 'query', 'type' => 'string', @@ -621,18 +617,22 @@ class Google_Service_Monitoring extends Google_Service 'location' => 'query', 'type' => 'string', ), - 'aggregation.perSeriesAligner' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', ), + 'aggregation.perSeriesAligner' => array( + 'location' => 'query', + 'type' => 'string', + ), 'interval.startTime' => array( 'location' => 'query', 'type' => 'string', ), + 'view' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ), ) diff --git a/vendor/google/apiclient-services/src/Google/Service/Monitoring/MetricDescriptor.php b/vendor/google/apiclient-services/src/Google/Service/Monitoring/MetricDescriptor.php index bb0aafa..eff6124 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Monitoring/MetricDescriptor.php +++ b/vendor/google/apiclient-services/src/Google/Service/Monitoring/MetricDescriptor.php @@ -17,7 +17,7 @@ class Google_Service_Monitoring_MetricDescriptor extends Google_Collection { - protected $collection_key = 'labels'; + protected $collection_key = 'monitoredResourceTypes'; public $description; public $displayName; protected $labelsType = 'Google_Service_Monitoring_LabelDescriptor'; @@ -26,6 +26,7 @@ class Google_Service_Monitoring_MetricDescriptor extends Google_Collection protected $metadataType = 'Google_Service_Monitoring_MetricDescriptorMetadata'; protected $metadataDataType = ''; public $metricKind; + public $monitoredResourceTypes; public $name; public $type; public $unit; @@ -91,6 +92,14 @@ class Google_Service_Monitoring_MetricDescriptor extends Google_Collection { return $this->metricKind; } + public function setMonitoredResourceTypes($monitoredResourceTypes) + { + $this->monitoredResourceTypes = $monitoredResourceTypes; + } + public function getMonitoredResourceTypes() + { + return $this->monitoredResourceTypes; + } public function setName($name) { $this->name = $name; diff --git a/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsAlertPolicies.php b/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsAlertPolicies.php index 8d6cf7c..a47dada 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsAlertPolicies.php +++ b/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsAlertPolicies.php @@ -84,6 +84,9 @@ class Google_Service_Monitoring_Resource_ProjectsAlertPolicies extends Google_Se * a single alerting policy by name, use the GetAlertPolicy operation, instead. * @param array $optParams Optional parameters. * + * @opt_param string filter If provided, this field specifies the criteria that + * must be met by alert policies to be included in the response.For more + * details, see sorting and filtering. * @opt_param string orderBy A comma-separated list of fields by which to sort * the result. Supports the same set of field references as the filter field. * Entries can be prefixed with a minus sign to sort by the field in descending @@ -94,9 +97,6 @@ class Google_Service_Monitoring_Resource_ProjectsAlertPolicies extends Google_Se * call. * @opt_param int pageSize The maximum number of results to return in a single * response. - * @opt_param string filter If provided, this field specifies the criteria that - * must be met by alert policies to be included in the response.For more - * details, see sorting and filtering. * @return Google_Service_Monitoring_ListAlertPoliciesResponse */ public function listProjectsAlertPolicies($name, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsGroups.php b/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsGroups.php index 470230c..86a75dd 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsGroups.php +++ b/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsGroups.php @@ -82,6 +82,13 @@ class Google_Service_Monitoring_Resource_ProjectsGroups extends Google_Service_R * "projects/{project_id_or_number}". * @param array $optParams Optional parameters. * + * @opt_param int pageSize A positive number that is the maximum number of + * results to return. + * @opt_param string ancestorsOfGroup A group name: + * "projects/{project_id_or_number}/groups/{group_id}". Returns groups that are + * ancestors of the specified group. The groups are returned in order, starting + * with the immediate parent and ending with the most distant ancestor. If the + * specified group has no immediate parent, the results are empty. * @opt_param string childrenOfGroup A group name: * "projects/{project_id_or_number}/groups/{group_id}". Returns groups whose * parentName field contains the group name. If no groups have this parent, the @@ -94,13 +101,6 @@ class Google_Service_Monitoring_Resource_ProjectsGroups extends Google_Service_R * the nextPageToken value returned by a previous call to this method. Using * this field causes the method to return additional results from the previous * method call. - * @opt_param int pageSize A positive number that is the maximum number of - * results to return. - * @opt_param string ancestorsOfGroup A group name: - * "projects/{project_id_or_number}/groups/{group_id}". Returns groups that are - * ancestors of the specified group. The groups are returned in order, starting - * with the immediate parent and ending with the most distant ancestor. If the - * specified group has no immediate parent, the results are empty. * @return Google_Service_Monitoring_ListGroupsResponse */ public function listProjectsGroups($name, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsGroupsMembers.php b/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsGroupsMembers.php index 63f7b32..61b6665 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsGroupsMembers.php +++ b/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsGroupsMembers.php @@ -43,11 +43,11 @@ class Google_Service_Monitoring_Resource_ProjectsGroupsMembers extends Google_Se * the nextPageToken value returned by a previous call to this method. Using * this field causes the method to return additional results from the previous * method call. + * @opt_param int pageSize A positive number that is the maximum number of + * results to return. * @opt_param string interval.startTime Optional. The beginning of the time * interval. The default value for the start time is the end time. The start * time must not be later than the end time. - * @opt_param int pageSize A positive number that is the maximum number of - * results to return. * @return Google_Service_Monitoring_ListGroupMembersResponse */ public function listProjectsGroupsMembers($name, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsMetricDescriptors.php b/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsMetricDescriptors.php index a170a76..6e0aea5 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsMetricDescriptors.php +++ b/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsMetricDescriptors.php @@ -84,17 +84,17 @@ class Google_Service_Monitoring_Resource_ProjectsMetricDescriptors extends Googl * is "projects/{project_id_or_number}". * @param array $optParams Optional parameters. * + * @opt_param string filter If this field is empty, all custom and system- + * defined metric descriptors are returned. Otherwise, the filter specifies + * which metric descriptors are to be returned. For example, the following + * filter matches all custom metrics: metric.type = + * starts_with("custom.googleapis.com/") * @opt_param string pageToken If this field is not empty then it must contain * the nextPageToken value returned by a previous call to this method. Using * this field causes the method to return additional results from the previous * method call. * @opt_param int pageSize A positive number that is the maximum number of * results to return. - * @opt_param string filter If this field is empty, all custom and system- - * defined metric descriptors are returned. Otherwise, the filter specifies - * which metric descriptors are to be returned. For example, the following - * filter matches all custom metrics: metric.type = - * starts_with("custom.googleapis.com/") * @return Google_Service_Monitoring_ListMetricDescriptorsResponse */ public function listProjectsMetricDescriptors($name, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsMonitoredResourceDescriptors.php b/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsMonitoredResourceDescriptors.php index 71f1b7e..8b851d0 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsMonitoredResourceDescriptors.php +++ b/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsMonitoredResourceDescriptors.php @@ -50,17 +50,17 @@ class Google_Service_Monitoring_Resource_ProjectsMonitoredResourceDescriptors ex * is "projects/{project_id_or_number}". * @param array $optParams Optional parameters. * - * @opt_param string filter An optional filter describing the descriptors to be - * returned. The filter can reference the descriptor's type and labels. For - * example, the following filter returns only Google Compute Engine descriptors - * that have an id label: resource.type = starts_with("gce_") AND - * resource.label:id * @opt_param string pageToken If this field is not empty then it must contain * the nextPageToken value returned by a previous call to this method. Using * this field causes the method to return additional results from the previous * method call. * @opt_param int pageSize A positive number that is the maximum number of * results to return. + * @opt_param string filter An optional filter describing the descriptors to be + * returned. The filter can reference the descriptor's type and labels. For + * example, the following filter returns only Google Compute Engine descriptors + * that have an id label: resource.type = starts_with("gce_") AND + * resource.label:id * @return Google_Service_Monitoring_ListMonitoredResourceDescriptorsResponse */ public function listProjectsMonitoredResourceDescriptors($name, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsNotificationChannels.php b/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsNotificationChannels.php index 2368aca..f7db431 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsNotificationChannels.php +++ b/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsNotificationChannels.php @@ -129,9 +129,6 @@ class Google_Service_Monitoring_Resource_ProjectsNotificationChannels extends Go * operation. * @param array $optParams Optional parameters. * - * @opt_param string filter If provided, this field specifies the criteria that - * must be met by notification channels to be included in the response.For more - * details, see sorting and filtering. * @opt_param string orderBy A comma-separated list of fields by which to sort * the result. Supports the same set of fields as in filter. Entries can be * prefixed with a minus sign to sort in descending rather than ascending @@ -142,6 +139,9 @@ class Google_Service_Monitoring_Resource_ProjectsNotificationChannels extends Go * @opt_param int pageSize The maximum number of results to return in a single * response. If not set to a positive number, a reasonable value will be chosen * by the service. + * @opt_param string filter If provided, this field specifies the criteria that + * must be met by notification channels to be included in the response.For more + * details, see sorting and filtering. * @return Google_Service_Monitoring_ListNotificationChannelsResponse */ public function listProjectsNotificationChannels($name, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsTimeSeries.php b/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsTimeSeries.php index adea748..c40dc64 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsTimeSeries.php +++ b/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsTimeSeries.php @@ -51,8 +51,6 @@ class Google_Service_Monitoring_Resource_ProjectsTimeSeries extends Google_Servi * is "projects/{project_id_or_number}". * @param array $optParams Optional parameters. * - * @opt_param string view Specifies which information is returned about the time - * series. * @opt_param string aggregation.groupByFields The set of fields to preserve * when crossSeriesReducer is specified. The groupByFields determine how the * time series are partitioned into subsets prior to applying the aggregation @@ -93,6 +91,10 @@ class Google_Service_Monitoring_Resource_ProjectsTimeSeries extends Google_Servi * additionally specify metric labels and other information. For example: * metric.type = "compute.googleapis.com/instance/cpu/usage_time" AND * metric.labels.instance_name = "my-instance-name" + * @opt_param string pageToken If this field is not empty then it must contain + * the nextPageToken value returned by a previous call to this method. Using + * this field causes the method to return additional results from the previous + * method call. * @opt_param string aggregation.perSeriesAligner The approach to be used to * align individual time series. Not all alignment functions may be applied to * all time series, depending on the metric type and value type of the original @@ -101,13 +103,11 @@ class Google_Service_Monitoring_Resource_ProjectsTimeSeries extends Google_Servi * series reduction. If crossSeriesReducer is specified, then perSeriesAligner * must be specified and not equal ALIGN_NONE and alignmentPeriod must be * specified; otherwise, an error is returned. - * @opt_param string pageToken If this field is not empty then it must contain - * the nextPageToken value returned by a previous call to this method. Using - * this field causes the method to return additional results from the previous - * method call. * @opt_param string interval.startTime Optional. The beginning of the time * interval. The default value for the start time is the end time. The start * time must not be later than the end time. + * @opt_param string view Specifies which information is returned about the time + * series. * @return Google_Service_Monitoring_ListTimeSeriesResponse */ public function listProjectsTimeSeries($name, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsUptimeCheckConfigs.php b/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsUptimeCheckConfigs.php index d388f53..de3cbee 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsUptimeCheckConfigs.php +++ b/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsUptimeCheckConfigs.php @@ -26,9 +26,9 @@ class Google_Service_Monitoring_Resource_ProjectsUptimeCheckConfigs extends Google_Service_Resource { /** - * Creates a new uptime check configuration. (uptimeCheckConfigs.create) + * Creates a new Uptime check configuration. (uptimeCheckConfigs.create) * - * @param string $parent The project in which to create the uptime check. The + * @param string $parent The project in which to create the Uptime check. The * format is projects/[PROJECT_ID]. * @param Google_Service_Monitoring_UptimeCheckConfig $postBody * @param array $optParams Optional parameters. @@ -41,12 +41,12 @@ class Google_Service_Monitoring_Resource_ProjectsUptimeCheckConfigs extends Goog return $this->call('create', array($params), "Google_Service_Monitoring_UptimeCheckConfig"); } /** - * Deletes an uptime check configuration. Note that this method will fail if the - * uptime check configuration is referenced by an alert policy or other + * Deletes an Uptime check configuration. Note that this method will fail if the + * Uptime check configuration is referenced by an alert policy or other * dependent configs that would be rendered invalid by the deletion. * (uptimeCheckConfigs.delete) * - * @param string $name The uptime check configuration to delete. The format is + * @param string $name The Uptime check configuration to delete. The format is * projects/[PROJECT_ID]/uptimeCheckConfigs/[UPTIME_CHECK_ID]. * @param array $optParams Optional parameters. * @return Google_Service_Monitoring_MonitoringEmpty @@ -58,9 +58,9 @@ class Google_Service_Monitoring_Resource_ProjectsUptimeCheckConfigs extends Goog return $this->call('delete', array($params), "Google_Service_Monitoring_MonitoringEmpty"); } /** - * Gets a single uptime check configuration. (uptimeCheckConfigs.get) + * Gets a single Uptime check configuration. (uptimeCheckConfigs.get) * - * @param string $name The uptime check configuration to retrieve. The format + * @param string $name The Uptime check configuration to retrieve. The format * is projects/[PROJECT_ID]/uptimeCheckConfigs/[UPTIME_CHECK_ID]. * @param array $optParams Optional parameters. * @return Google_Service_Monitoring_UptimeCheckConfig @@ -72,11 +72,11 @@ class Google_Service_Monitoring_Resource_ProjectsUptimeCheckConfigs extends Goog return $this->call('get', array($params), "Google_Service_Monitoring_UptimeCheckConfig"); } /** - * Lists the existing valid uptime check configurations for the project, leaving - * out any invalid configurations. + * Lists the existing valid Uptime check configurations for the project (leaving + * out any invalid configurations). * (uptimeCheckConfigs.listProjectsUptimeCheckConfigs) * - * @param string $parent The project whose uptime check configurations are + * @param string $parent The project whose Uptime check configurations are * listed. The format is projects/[PROJECT_ID]. * @param array $optParams Optional parameters. * @@ -97,21 +97,21 @@ class Google_Service_Monitoring_Resource_ProjectsUptimeCheckConfigs extends Goog return $this->call('list', array($params), "Google_Service_Monitoring_ListUptimeCheckConfigsResponse"); } /** - * Updates an uptime check configuration. You can either replace the entire + * Updates an Uptime check configuration. You can either replace the entire * configuration with a new one or replace only certain fields in the current - * configuration by specifying the fields to be updated via "updateMask". - * Returns the updated configuration. (uptimeCheckConfigs.patch) + * configuration by specifying the fields to be updated via updateMask. Returns + * the updated configuration. (uptimeCheckConfigs.patch) * - * @param string $name A unique resource name for this UptimeCheckConfig. The - * format is:projects/[PROJECT_ID]/uptimeCheckConfigs/[UPTIME_CHECK_ID].This - * field should be omitted when creating the uptime check configuration; on - * create, the resource name is assigned by the server and included in the - * response. + * @param string $name A unique resource name for this Uptime check + * configuration. The format + * is:projects/[PROJECT_ID]/uptimeCheckConfigs/[UPTIME_CHECK_ID].This field + * should be omitted when creating the Uptime check configuration; on create, + * the resource name is assigned by the server and included in the response. * @param Google_Service_Monitoring_UptimeCheckConfig $postBody * @param array $optParams Optional parameters. * * @opt_param string updateMask Optional. If present, only the listed fields in - * the current uptime check configuration are updated with values from the new + * the current Uptime check configuration are updated with values from the new * configuration. If this field is empty, then the current configuration is * completely replaced with the new configuration. * @return Google_Service_Monitoring_UptimeCheckConfig diff --git a/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/UptimeCheckIps.php b/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/UptimeCheckIps.php index 77bd762..04b786e 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/UptimeCheckIps.php +++ b/vendor/google/apiclient-services/src/Google/Service/Monitoring/Resource/UptimeCheckIps.php @@ -26,7 +26,7 @@ class Google_Service_Monitoring_Resource_UptimeCheckIps extends Google_Service_Resource { /** - * Returns the list of IPs that checkers run from + * Returns the list of IP addresses that checkers run from * (uptimeCheckIps.listUptimeCheckIps) * * @param array $optParams Optional parameters. diff --git a/vendor/google/apiclient-services/src/Google/Service/Monitoring/UptimeCheckConfig.php b/vendor/google/apiclient-services/src/Google/Service/Monitoring/UptimeCheckConfig.php index 80dce22..bbfd4bc 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Monitoring/UptimeCheckConfig.php +++ b/vendor/google/apiclient-services/src/Google/Service/Monitoring/UptimeCheckConfig.php @@ -25,6 +25,7 @@ class Google_Service_Monitoring_UptimeCheckConfig extends Google_Collection protected $httpCheckDataType = ''; protected $internalCheckersType = 'Google_Service_Monitoring_InternalChecker'; protected $internalCheckersDataType = 'array'; + public $isInternal; protected $monitoredResourceType = 'Google_Service_Monitoring_MonitoredResource'; protected $monitoredResourceDataType = ''; public $name; @@ -86,6 +87,14 @@ class Google_Service_Monitoring_UptimeCheckConfig extends Google_Collection { return $this->internalCheckers; } + public function setIsInternal($isInternal) + { + $this->isInternal = $isInternal; + } + public function getIsInternal() + { + return $this->isInternal; + } /** * @param Google_Service_Monitoring_MonitoredResource */ diff --git a/vendor/google/apiclient-services/src/Google/Service/PeopleService.php b/vendor/google/apiclient-services/src/Google/Service/PeopleService.php index 4760514..b4d88b0 100644 --- a/vendor/google/apiclient-services/src/Google/Service/PeopleService.php +++ b/vendor/google/apiclient-services/src/Google/Service/PeopleService.php @@ -239,6 +239,11 @@ class Google_Service_PeopleService extends Google_Service 'path' => 'v1/people:batchGet', 'httpMethod' => 'GET', 'parameters' => array( + 'resourceNames' => array( + 'location' => 'query', + 'type' => 'string', + 'repeated' => true, + ), 'personFields' => array( 'location' => 'query', 'type' => 'string', @@ -247,11 +252,6 @@ class Google_Service_PeopleService extends Google_Service 'location' => 'query', 'type' => 'string', ), - 'resourceNames' => array( - 'location' => 'query', - 'type' => 'string', - 'repeated' => true, - ), ), ),'updateContact' => array( 'path' => 'v1/{+resourceName}:updateContact', @@ -296,6 +296,10 @@ class Google_Service_PeopleService extends Google_Service 'type' => 'string', 'required' => true, ), + 'syncToken' => array( + 'location' => 'query', + 'type' => 'string', + ), 'personFields' => array( 'location' => 'query', 'type' => 'string', @@ -312,17 +316,13 @@ class Google_Service_PeopleService extends Google_Service 'location' => 'query', 'type' => 'string', ), - 'pageSize' => array( - 'location' => 'query', - 'type' => 'integer', - ), 'requestMask.includeField' => array( 'location' => 'query', 'type' => 'string', ), - 'syncToken' => array( + 'pageSize' => array( 'location' => 'query', - 'type' => 'string', + 'type' => 'integer', ), ), ), diff --git a/vendor/google/apiclient-services/src/Google/Service/PeopleService/Resource/People.php b/vendor/google/apiclient-services/src/Google/Service/PeopleService/Resource/People.php index 971da12..9914ade 100644 --- a/vendor/google/apiclient-services/src/Google/Service/PeopleService/Resource/People.php +++ b/vendor/google/apiclient-services/src/Google/Service/PeopleService/Resource/People.php @@ -128,6 +128,16 @@ class Google_Service_PeopleService_Resource_People extends Google_Service_Resour * * @param array $optParams Optional parameters. * + * @opt_param string resourceNames The resource names of the people to provide + * information about. + * + * - To get information about the authenticated user, specify `people/me`. - To + * get information about a google account, specify `people/`account_id. - To + * get information about a contact, specify the resource name that identifies + * the contact as returned by + * [`people.connections.list`](/people/api/rest/v1/people.connections/list). + * + * You can include up to 50 resource names in one request. * @opt_param string personFields **Required.** A field mask to restrict which * fields on each person are returned. Multiple fields can be specified by * separating them with commas. Valid values are: @@ -141,16 +151,6 @@ class Google_Service_PeopleService_Resource_People extends Google_Service_Resour * @opt_param string requestMask.includeField **Required.** Comma-separated list * of person fields to be included in the response. Each path should start with * `person.`: for example, `person.names` or `person.photos`. - * @opt_param string resourceNames The resource names of the people to provide - * information about. - * - * - To get information about the authenticated user, specify `people/me`. - To - * get information about a google account, specify `people/`account_id. - To - * get information about a contact, specify the resource name that identifies - * the contact as returned by - * [`people.connections.list`](/people/api/rest/v1/people.connections/list). - * - * You can include up to 50 resource names in one request. * @return Google_Service_PeopleService_GetPeopleResponse */ public function getBatchGet($optParams = array()) @@ -168,10 +168,11 @@ class Google_Service_PeopleService_Resource_People extends Google_Service_Resour * The request throws a 400 error if `person.metadata.sources` is not specified * for the contact to be updated. * - * The request throws a 412 error if `person.metadata.sources.etag` is different - * than the contact's etag, which indicates the contact has changed since its - * data was read. Clients should get the latest person and re-apply their - * updates to the latest person. (people.updateContact) + * The request throws a 400 error with an error with reason + * `"failedPrecondition"` if `person.metadata.sources.etag` is different than + * the contact's etag, which indicates the contact has changed since its data + * was read. Clients should get the latest person and re-apply their updates to + * the latest person. (people.updateContact) * * @param string $resourceName The resource name for the person, assigned by the * server. An ASCII string with a max length of 27 characters, in the form of diff --git a/vendor/google/apiclient-services/src/Google/Service/PeopleService/Resource/PeopleConnections.php b/vendor/google/apiclient-services/src/Google/Service/PeopleService/Resource/PeopleConnections.php index b5d1b65..4cf8bd4 100644 --- a/vendor/google/apiclient-services/src/Google/Service/PeopleService/Resource/PeopleConnections.php +++ b/vendor/google/apiclient-services/src/Google/Service/PeopleService/Resource/PeopleConnections.php @@ -36,6 +36,10 @@ class Google_Service_PeopleService_Resource_PeopleConnections extends Google_Ser * `people/me` is valid. * @param array $optParams Optional parameters. * + * @opt_param string syncToken A sync token returned by a previous call to + * `people.connections.list`. Only resources changed since the sync token was + * created will be returned. Sync requests that specify `sync_token` have an + * additional rate limit. * @opt_param string personFields **Required.** A field mask to restrict which * fields on each person are returned. Multiple fields can be specified by * separating them with commas. Valid values are: @@ -53,15 +57,11 @@ class Google_Service_PeopleService_Resource_PeopleConnections extends Google_Ser * subsequent sync requests use the `sync_token` param instead. Initial sync * requests that specify `request_sync_token` have an additional rate limit. * @opt_param string pageToken The token of the page to be returned. - * @opt_param int pageSize The number of connections to include in the response. - * Valid values are between 1 and 2000, inclusive. Defaults to 100. * @opt_param string requestMask.includeField **Required.** Comma-separated list * of person fields to be included in the response. Each path should start with * `person.`: for example, `person.names` or `person.photos`. - * @opt_param string syncToken A sync token returned by a previous call to - * `people.connections.list`. Only resources changed since the sync token was - * created will be returned. Sync requests that specify `sync_token` have an - * additional rate limit. + * @opt_param int pageSize The number of connections to include in the response. + * Valid values are between 1 and 2000, inclusive. Defaults to 100. * @return Google_Service_PeopleService_ListConnectionsResponse */ public function listPeopleConnections($resourceName, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter.php b/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter.php new file mode 100644 index 0000000..e19dab5 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter.php @@ -0,0 +1,69 @@ + +

+ * + *

+ * For more information about this service, see the API + * Documentation + *

+ * + * @author Google, Inc. + */ +class Google_Service_PolicyTroubleshooter extends Google_Service +{ + /** View and manage your data across Google Cloud Platform services. */ + const CLOUD_PLATFORM = + "https://www.googleapis.com/auth/cloud-platform"; + + public $iam; + + /** + * Constructs the internal representation of the PolicyTroubleshooter service. + * + * @param Google_Client $client The client used to deliver requests. + * @param string $rootUrl The root URL used for requests to the service. + */ + public function __construct(Google_Client $client, $rootUrl = null) + { + parent::__construct($client); + $this->rootUrl = $rootUrl ?: 'https://policytroubleshooter.googleapis.com/'; + $this->servicePath = ''; + $this->batchPath = 'batch'; + $this->version = 'v1beta'; + $this->serviceName = 'policytroubleshooter'; + + $this->iam = new Google_Service_PolicyTroubleshooter_Resource_Iam( + $this, + $this->serviceName, + 'iam', + array( + 'methods' => array( + 'troubleshoot' => array( + 'path' => 'v1beta/iam:troubleshoot', + 'httpMethod' => 'POST', + 'parameters' => array(), + ), + ) + ) + ); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p4beta1QualityOptimizationResult.php b/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/GoogleCloudPolicytroubleshooterV1betaAccessTuple.php similarity index 50% rename from vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p4beta1QualityOptimizationResult.php rename to vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/GoogleCloudPolicytroubleshooterV1betaAccessTuple.php index 2724971..89c1c27 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p4beta1QualityOptimizationResult.php +++ b/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/GoogleCloudPolicytroubleshooterV1betaAccessTuple.php @@ -15,34 +15,34 @@ * the License. */ -class Google_Service_Vision_GoogleCloudVisionV1p4beta1QualityOptimizationResult extends Google_Model +class Google_Service_PolicyTroubleshooter_GoogleCloudPolicytroubleshooterV1betaAccessTuple extends Google_Model { - public $image; - public $mimeType; - public $qualityOptimizationType; + public $fullResourceName; + public $permission; + public $principal; - public function setImage($image) + public function setFullResourceName($fullResourceName) { - $this->image = $image; + $this->fullResourceName = $fullResourceName; } - public function getImage() + public function getFullResourceName() { - return $this->image; + return $this->fullResourceName; } - public function setMimeType($mimeType) + public function setPermission($permission) { - $this->mimeType = $mimeType; + $this->permission = $permission; } - public function getMimeType() + public function getPermission() { - return $this->mimeType; + return $this->permission; } - public function setQualityOptimizationType($qualityOptimizationType) + public function setPrincipal($principal) { - $this->qualityOptimizationType = $qualityOptimizationType; + $this->principal = $principal; } - public function getQualityOptimizationType() + public function getPrincipal() { - return $this->qualityOptimizationType; + return $this->principal; } } diff --git a/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/GoogleCloudPolicytroubleshooterV1betaBindingExplanation.php b/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/GoogleCloudPolicytroubleshooterV1betaBindingExplanation.php new file mode 100644 index 0000000..6c7d582 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/GoogleCloudPolicytroubleshooterV1betaBindingExplanation.php @@ -0,0 +1,98 @@ +access = $access; + } + public function getAccess() + { + return $this->access; + } + /** + * @param Google_Service_PolicyTroubleshooter_GoogleTypeExpr + */ + public function setCondition(Google_Service_PolicyTroubleshooter_GoogleTypeExpr $condition) + { + $this->condition = $condition; + } + /** + * @return Google_Service_PolicyTroubleshooter_GoogleTypeExpr + */ + public function getCondition() + { + return $this->condition; + } + /** + * @param Google_Service_PolicyTroubleshooter_GoogleCloudPolicytroubleshooterV1betaBindingExplanationAnnotatedMembership + */ + public function setMemberships($memberships) + { + $this->memberships = $memberships; + } + /** + * @return Google_Service_PolicyTroubleshooter_GoogleCloudPolicytroubleshooterV1betaBindingExplanationAnnotatedMembership + */ + public function getMemberships() + { + return $this->memberships; + } + public function setRelevance($relevance) + { + $this->relevance = $relevance; + } + public function getRelevance() + { + return $this->relevance; + } + public function setRole($role) + { + $this->role = $role; + } + public function getRole() + { + return $this->role; + } + public function setRolePermission($rolePermission) + { + $this->rolePermission = $rolePermission; + } + public function getRolePermission() + { + return $this->rolePermission; + } + public function setRolePermissionRelevance($rolePermissionRelevance) + { + $this->rolePermissionRelevance = $rolePermissionRelevance; + } + public function getRolePermissionRelevance() + { + return $this->rolePermissionRelevance; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/GoogleCloudPolicytroubleshooterV1betaBindingExplanationAnnotatedMembership.php b/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/GoogleCloudPolicytroubleshooterV1betaBindingExplanationAnnotatedMembership.php new file mode 100644 index 0000000..7c9a3c5 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/GoogleCloudPolicytroubleshooterV1betaBindingExplanationAnnotatedMembership.php @@ -0,0 +1,39 @@ +membership = $membership; + } + public function getMembership() + { + return $this->membership; + } + public function setRelevance($relevance) + { + $this->relevance = $relevance; + } + public function getRelevance() + { + return $this->relevance; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/GoogleCloudPolicytroubleshooterV1betaExplainedPolicy.php b/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/GoogleCloudPolicytroubleshooterV1betaExplainedPolicy.php new file mode 100644 index 0000000..7f445bc --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/GoogleCloudPolicytroubleshooterV1betaExplainedPolicy.php @@ -0,0 +1,81 @@ +access = $access; + } + public function getAccess() + { + return $this->access; + } + /** + * @param Google_Service_PolicyTroubleshooter_GoogleCloudPolicytroubleshooterV1betaBindingExplanation + */ + public function setBindingExplanations($bindingExplanations) + { + $this->bindingExplanations = $bindingExplanations; + } + /** + * @return Google_Service_PolicyTroubleshooter_GoogleCloudPolicytroubleshooterV1betaBindingExplanation + */ + public function getBindingExplanations() + { + return $this->bindingExplanations; + } + public function setFullResourceName($fullResourceName) + { + $this->fullResourceName = $fullResourceName; + } + public function getFullResourceName() + { + return $this->fullResourceName; + } + /** + * @param Google_Service_PolicyTroubleshooter_GoogleIamV1Policy + */ + public function setPolicy(Google_Service_PolicyTroubleshooter_GoogleIamV1Policy $policy) + { + $this->policy = $policy; + } + /** + * @return Google_Service_PolicyTroubleshooter_GoogleIamV1Policy + */ + public function getPolicy() + { + return $this->policy; + } + public function setRelevance($relevance) + { + $this->relevance = $relevance; + } + public function getRelevance() + { + return $this->relevance; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/GoogleCloudPolicytroubleshooterV1betaTroubleshootIamPolicyRequest.php b/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/GoogleCloudPolicytroubleshooterV1betaTroubleshootIamPolicyRequest.php new file mode 100644 index 0000000..18c22e1 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/GoogleCloudPolicytroubleshooterV1betaTroubleshootIamPolicyRequest.php @@ -0,0 +1,37 @@ +accessTuple = $accessTuple; + } + /** + * @return Google_Service_PolicyTroubleshooter_GoogleCloudPolicytroubleshooterV1betaAccessTuple + */ + public function getAccessTuple() + { + return $this->accessTuple; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/GoogleCloudPolicytroubleshooterV1betaTroubleshootIamPolicyResponse.php b/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/GoogleCloudPolicytroubleshooterV1betaTroubleshootIamPolicyResponse.php new file mode 100644 index 0000000..e8febf0 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/GoogleCloudPolicytroubleshooterV1betaTroubleshootIamPolicyResponse.php @@ -0,0 +1,47 @@ +access = $access; + } + public function getAccess() + { + return $this->access; + } + /** + * @param Google_Service_PolicyTroubleshooter_GoogleCloudPolicytroubleshooterV1betaExplainedPolicy + */ + public function setExplainedPolicies($explainedPolicies) + { + $this->explainedPolicies = $explainedPolicies; + } + /** + * @return Google_Service_PolicyTroubleshooter_GoogleCloudPolicytroubleshooterV1betaExplainedPolicy + */ + public function getExplainedPolicies() + { + return $this->explainedPolicies; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/GoogleIamV1AuditConfig.php b/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/GoogleIamV1AuditConfig.php new file mode 100644 index 0000000..4bc42b8 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/GoogleIamV1AuditConfig.php @@ -0,0 +1,47 @@ +auditLogConfigs = $auditLogConfigs; + } + /** + * @return Google_Service_PolicyTroubleshooter_GoogleIamV1AuditLogConfig + */ + public function getAuditLogConfigs() + { + return $this->auditLogConfigs; + } + public function setService($service) + { + $this->service = $service; + } + public function getService() + { + return $this->service; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/GoogleIamV1AuditLogConfig.php b/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/GoogleIamV1AuditLogConfig.php new file mode 100644 index 0000000..1ba037a --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/GoogleIamV1AuditLogConfig.php @@ -0,0 +1,40 @@ +exemptedMembers = $exemptedMembers; + } + public function getExemptedMembers() + { + return $this->exemptedMembers; + } + public function setLogType($logType) + { + $this->logType = $logType; + } + public function getLogType() + { + return $this->logType; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/GoogleIamV1Binding.php b/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/GoogleIamV1Binding.php new file mode 100644 index 0000000..360c42c --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/GoogleIamV1Binding.php @@ -0,0 +1,56 @@ +condition = $condition; + } + /** + * @return Google_Service_PolicyTroubleshooter_GoogleTypeExpr + */ + public function getCondition() + { + return $this->condition; + } + public function setMembers($members) + { + $this->members = $members; + } + public function getMembers() + { + return $this->members; + } + public function setRole($role) + { + $this->role = $role; + } + public function getRole() + { + return $this->role; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/GoogleIamV1Policy.php b/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/GoogleIamV1Policy.php new file mode 100644 index 0000000..cdf143b --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/GoogleIamV1Policy.php @@ -0,0 +1,72 @@ +auditConfigs = $auditConfigs; + } + /** + * @return Google_Service_PolicyTroubleshooter_GoogleIamV1AuditConfig + */ + public function getAuditConfigs() + { + return $this->auditConfigs; + } + /** + * @param Google_Service_PolicyTroubleshooter_GoogleIamV1Binding + */ + public function setBindings($bindings) + { + $this->bindings = $bindings; + } + /** + * @return Google_Service_PolicyTroubleshooter_GoogleIamV1Binding + */ + public function getBindings() + { + return $this->bindings; + } + public function setEtag($etag) + { + $this->etag = $etag; + } + public function getEtag() + { + return $this->etag; + } + public function setVersion($version) + { + $this->version = $version; + } + public function getVersion() + { + return $this->version; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/GoogleTypeExpr.php b/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/GoogleTypeExpr.php new file mode 100644 index 0000000..ad9d88f --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/GoogleTypeExpr.php @@ -0,0 +1,57 @@ +description = $description; + } + public function getDescription() + { + return $this->description; + } + public function setExpression($expression) + { + $this->expression = $expression; + } + public function getExpression() + { + return $this->expression; + } + public function setLocation($location) + { + $this->location = $location; + } + public function getLocation() + { + return $this->location; + } + public function setTitle($title) + { + $this->title = $title; + } + public function getTitle() + { + return $this->title; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/Resource/Iam.php b/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/Resource/Iam.php new file mode 100644 index 0000000..b893c26 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/PolicyTroubleshooter/Resource/Iam.php @@ -0,0 +1,43 @@ + + * $policytroubleshooterService = new Google_Service_PolicyTroubleshooter(...); + * $iam = $policytroubleshooterService->iam; + * + */ +class Google_Service_PolicyTroubleshooter_Resource_Iam extends Google_Service_Resource +{ + /** + * Perform a check on whether a member is granted a permission on a resource and + * how that grant/deny is determined accordinga to the resource's effective IAM + * policy interpretation. (iam.troubleshoot) + * + * @param Google_Service_PolicyTroubleshooter_GoogleCloudPolicytroubleshooterV1betaTroubleshootIamPolicyRequest $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_PolicyTroubleshooter_GoogleCloudPolicytroubleshooterV1betaTroubleshootIamPolicyResponse + */ + public function troubleshoot(Google_Service_PolicyTroubleshooter_GoogleCloudPolicytroubleshooterV1betaTroubleshootIamPolicyRequest $postBody, $optParams = array()) + { + $params = array('postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('troubleshoot', array($params), "Google_Service_PolicyTroubleshooter_GoogleCloudPolicytroubleshooterV1betaTroubleshootIamPolicyResponse"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Proximitybeacon.php b/vendor/google/apiclient-services/src/Google/Service/Proximitybeacon.php index 95361ad..ef1f878 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Proximitybeacon.php +++ b/vendor/google/apiclient-services/src/Google/Service/Proximitybeacon.php @@ -209,11 +209,11 @@ class Google_Service_Proximitybeacon extends Google_Service 'type' => 'string', 'required' => true, ), - 'namespacedType' => array( + 'projectId' => array( 'location' => 'query', 'type' => 'string', ), - 'projectId' => array( + 'namespacedType' => array( 'location' => 'query', 'type' => 'string', ), diff --git a/vendor/google/apiclient-services/src/Google/Service/Proximitybeacon/Resource/BeaconsAttachments.php b/vendor/google/apiclient-services/src/Google/Service/Proximitybeacon/Resource/BeaconsAttachments.php index 0b2ff42..b4cad00 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Proximitybeacon/Resource/BeaconsAttachments.php +++ b/vendor/google/apiclient-services/src/Google/Service/Proximitybeacon/Resource/BeaconsAttachments.php @@ -47,14 +47,14 @@ class Google_Service_Proximitybeacon_Resource_BeaconsAttachments extends Google_ * the current EID or the beacon's "stable" UID. Required. * @param array $optParams Optional parameters. * - * @opt_param string namespacedType Specifies the namespace and type of - * attachments to delete in `namespace/type` format. Accepts `*` to specify "all - * types in all namespaces". Optional. * @opt_param string projectId The project id to delete beacon attachments * under. This field can be used when "*" is specified to mean all attachment * namespaces. Projects may have multiple attachments with multiple namespaces. * If "*" is specified and the projectId string is empty, then the project * making the request is used. Optional. + * @opt_param string namespacedType Specifies the namespace and type of + * attachments to delete in `namespace/type` format. Accepts `*` to specify "all + * types in all namespaces". Optional. * @return Google_Service_Proximitybeacon_DeleteAttachmentsResponse */ public function batchDelete($beaconName, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Pubsub/Resource/ProjectsSnapshots.php b/vendor/google/apiclient-services/src/Google/Service/Pubsub/Resource/ProjectsSnapshots.php index 7d5e8b1..00224c4 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Pubsub/Resource/ProjectsSnapshots.php +++ b/vendor/google/apiclient-services/src/Google/Service/Pubsub/Resource/ProjectsSnapshots.php @@ -105,8 +105,14 @@ class Google_Service_Pubsub_Resource_ProjectsSnapshots extends Google_Service_Re * @param array $optParams Optional parameters. * * @opt_param int options.requestedPolicyVersion Optional. The policy format - * version to be returned. Acceptable values are 0, 1, and 3. If the value is 0, - * or the field is omitted, policy format version 1 will be returned. + * version to be returned. + * + * Valid values are 0, 1, and 3. Requests specifying an invalid value will be + * rejected. + * + * Requests for policies with any conditional bindings must specify version 3. + * Policies without any conditional bindings may specify any valid value or + * leave the field unset. * @return Google_Service_Pubsub_Policy */ public function getIamPolicy($resource, $optParams = array()) @@ -157,7 +163,10 @@ class Google_Service_Pubsub_Resource_ProjectsSnapshots extends Google_Service_Re } /** * Sets the access control policy on the specified resource. Replaces any - * existing policy. (snapshots.setIamPolicy) + * existing policy. + * + * Can return Public Errors: NOT_FOUND, INVALID_ARGUMENT and PERMISSION_DENIED + * (snapshots.setIamPolicy) * * @param string $resource REQUIRED: The resource for which the policy is being * specified. See the operation documentation for the appropriate value for this diff --git a/vendor/google/apiclient-services/src/Google/Service/Pubsub/Resource/ProjectsSubscriptions.php b/vendor/google/apiclient-services/src/Google/Service/Pubsub/Resource/ProjectsSubscriptions.php index 0ea4e31..b24e7d2 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Pubsub/Resource/ProjectsSubscriptions.php +++ b/vendor/google/apiclient-services/src/Google/Service/Pubsub/Resource/ProjectsSubscriptions.php @@ -119,8 +119,14 @@ class Google_Service_Pubsub_Resource_ProjectsSubscriptions extends Google_Servic * @param array $optParams Optional parameters. * * @opt_param int options.requestedPolicyVersion Optional. The policy format - * version to be returned. Acceptable values are 0, 1, and 3. If the value is 0, - * or the field is omitted, policy format version 1 will be returned. + * version to be returned. + * + * Valid values are 0, 1, and 3. Requests specifying an invalid value will be + * rejected. + * + * Requests for policies with any conditional bindings must specify version 3. + * Policies without any conditional bindings may specify any valid value or + * leave the field unset. * @return Google_Service_Pubsub_Policy */ public function getIamPolicy($resource, $optParams = array()) @@ -248,7 +254,10 @@ class Google_Service_Pubsub_Resource_ProjectsSubscriptions extends Google_Servic } /** * Sets the access control policy on the specified resource. Replaces any - * existing policy. (subscriptions.setIamPolicy) + * existing policy. + * + * Can return Public Errors: NOT_FOUND, INVALID_ARGUMENT and PERMISSION_DENIED + * (subscriptions.setIamPolicy) * * @param string $resource REQUIRED: The resource for which the policy is being * specified. See the operation documentation for the appropriate value for this diff --git a/vendor/google/apiclient-services/src/Google/Service/Pubsub/Resource/ProjectsTopics.php b/vendor/google/apiclient-services/src/Google/Service/Pubsub/Resource/ProjectsTopics.php index ae0f272..ae36451 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Pubsub/Resource/ProjectsTopics.php +++ b/vendor/google/apiclient-services/src/Google/Service/Pubsub/Resource/ProjectsTopics.php @@ -88,8 +88,14 @@ class Google_Service_Pubsub_Resource_ProjectsTopics extends Google_Service_Resou * @param array $optParams Optional parameters. * * @opt_param int options.requestedPolicyVersion Optional. The policy format - * version to be returned. Acceptable values are 0, 1, and 3. If the value is 0, - * or the field is omitted, policy format version 1 will be returned. + * version to be returned. + * + * Valid values are 0, 1, and 3. Requests specifying an invalid value will be + * rejected. + * + * Requests for policies with any conditional bindings must specify version 3. + * Policies without any conditional bindings may specify any valid value or + * leave the field unset. * @return Google_Service_Pubsub_Policy */ public function getIamPolicy($resource, $optParams = array()) @@ -155,7 +161,10 @@ class Google_Service_Pubsub_Resource_ProjectsTopics extends Google_Service_Resou } /** * Sets the access control policy on the specified resource. Replaces any - * existing policy. (topics.setIamPolicy) + * existing policy. + * + * Can return Public Errors: NOT_FOUND, INVALID_ARGUMENT and PERMISSION_DENIED + * (topics.setIamPolicy) * * @param string $resource REQUIRED: The resource for which the policy is being * specified. See the operation documentation for the appropriate value for this diff --git a/vendor/google/apiclient-services/src/Google/Service/Recommender.php b/vendor/google/apiclient-services/src/Google/Service/Recommender.php new file mode 100644 index 0000000..fc31654 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Recommender.php @@ -0,0 +1,127 @@ + +

+ * + *

+ * For more information about this service, see the API + * Documentation + *

+ * + * @author Google, Inc. + */ +class Google_Service_Recommender 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_locations_recommenders_recommendations; + + /** + * Constructs the internal representation of the Recommender service. + * + * @param Google_Client $client The client used to deliver requests. + * @param string $rootUrl The root URL used for requests to the service. + */ + public function __construct(Google_Client $client, $rootUrl = null) + { + parent::__construct($client); + $this->rootUrl = $rootUrl ?: 'https://recommender.googleapis.com/'; + $this->servicePath = ''; + $this->batchPath = 'batch'; + $this->version = 'v1beta1'; + $this->serviceName = 'recommender'; + + $this->projects_locations_recommenders_recommendations = new Google_Service_Recommender_Resource_ProjectsLocationsRecommendersRecommendations( + $this, + $this->serviceName, + 'recommendations', + array( + 'methods' => array( + 'get' => array( + 'path' => 'v1beta1/{+name}', + 'httpMethod' => 'GET', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'list' => array( + 'path' => 'v1beta1/{+parent}/recommendations', + 'httpMethod' => 'GET', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'pageSize' => array( + 'location' => 'query', + 'type' => 'integer', + ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), + ), + ),'markClaimed' => array( + 'path' => 'v1beta1/{+name}:markClaimed', + 'httpMethod' => 'POST', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'markFailed' => array( + 'path' => 'v1beta1/{+name}:markFailed', + 'httpMethod' => 'POST', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'markSucceeded' => array( + 'path' => 'v1beta1/{+name}:markSucceeded', + 'httpMethod' => 'POST', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ), + ) + ) + ); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1CostProjection.php b/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1CostProjection.php new file mode 100644 index 0000000..8652979 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1CostProjection.php @@ -0,0 +1,46 @@ +cost = $cost; + } + /** + * @return Google_Service_Recommender_GoogleTypeMoney + */ + public function getCost() + { + return $this->cost; + } + public function setDuration($duration) + { + $this->duration = $duration; + } + public function getDuration() + { + return $this->duration; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1Impact.php b/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1Impact.php new file mode 100644 index 0000000..62215c2 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1Impact.php @@ -0,0 +1,46 @@ +category = $category; + } + public function getCategory() + { + return $this->category; + } + /** + * @param Google_Service_Recommender_GoogleCloudRecommenderV1beta1CostProjection + */ + public function setCostProjection(Google_Service_Recommender_GoogleCloudRecommenderV1beta1CostProjection $costProjection) + { + $this->costProjection = $costProjection; + } + /** + * @return Google_Service_Recommender_GoogleCloudRecommenderV1beta1CostProjection + */ + public function getCostProjection() + { + return $this->costProjection; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1ListRecommendationsResponse.php b/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1ListRecommendationsResponse.php new file mode 100644 index 0000000..896d055 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1ListRecommendationsResponse.php @@ -0,0 +1,47 @@ +nextPageToken = $nextPageToken; + } + public function getNextPageToken() + { + return $this->nextPageToken; + } + /** + * @param Google_Service_Recommender_GoogleCloudRecommenderV1beta1Recommendation + */ + public function setRecommendations($recommendations) + { + $this->recommendations = $recommendations; + } + /** + * @return Google_Service_Recommender_GoogleCloudRecommenderV1beta1Recommendation + */ + public function getRecommendations() + { + return $this->recommendations; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1MarkRecommendationClaimedRequest.php b/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1MarkRecommendationClaimedRequest.php new file mode 100644 index 0000000..47e87cb --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1MarkRecommendationClaimedRequest.php @@ -0,0 +1,39 @@ +etag = $etag; + } + public function getEtag() + { + return $this->etag; + } + public function setStateMetadata($stateMetadata) + { + $this->stateMetadata = $stateMetadata; + } + public function getStateMetadata() + { + return $this->stateMetadata; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1MarkRecommendationFailedRequest.php b/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1MarkRecommendationFailedRequest.php new file mode 100644 index 0000000..e3b7858 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1MarkRecommendationFailedRequest.php @@ -0,0 +1,39 @@ +etag = $etag; + } + public function getEtag() + { + return $this->etag; + } + public function setStateMetadata($stateMetadata) + { + $this->stateMetadata = $stateMetadata; + } + public function getStateMetadata() + { + return $this->stateMetadata; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1MarkRecommendationSucceededRequest.php b/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1MarkRecommendationSucceededRequest.php new file mode 100644 index 0000000..983e124 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1MarkRecommendationSucceededRequest.php @@ -0,0 +1,39 @@ +etag = $etag; + } + public function getEtag() + { + return $this->etag; + } + public function setStateMetadata($stateMetadata) + { + $this->stateMetadata = $stateMetadata; + } + public function getStateMetadata() + { + return $this->stateMetadata; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1Operation.php b/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1Operation.php new file mode 100644 index 0000000..356803f --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1Operation.php @@ -0,0 +1,125 @@ +action = $action; + } + public function getAction() + { + return $this->action; + } + public function setPath($path) + { + $this->path = $path; + } + public function getPath() + { + return $this->path; + } + public function setPathFilters($pathFilters) + { + $this->pathFilters = $pathFilters; + } + public function getPathFilters() + { + return $this->pathFilters; + } + /** + * @param Google_Service_Recommender_GoogleCloudRecommenderV1beta1ValueMatcher + */ + public function setPathValueMatchers($pathValueMatchers) + { + $this->pathValueMatchers = $pathValueMatchers; + } + /** + * @return Google_Service_Recommender_GoogleCloudRecommenderV1beta1ValueMatcher + */ + public function getPathValueMatchers() + { + return $this->pathValueMatchers; + } + public function setResource($resource) + { + $this->resource = $resource; + } + public function getResource() + { + return $this->resource; + } + public function setResourceType($resourceType) + { + $this->resourceType = $resourceType; + } + public function getResourceType() + { + return $this->resourceType; + } + public function setSourcePath($sourcePath) + { + $this->sourcePath = $sourcePath; + } + public function getSourcePath() + { + return $this->sourcePath; + } + public function setSourceResource($sourceResource) + { + $this->sourceResource = $sourceResource; + } + public function getSourceResource() + { + return $this->sourceResource; + } + public function setValue($value) + { + $this->value = $value; + } + public function getValue() + { + return $this->value; + } + /** + * @param Google_Service_Recommender_GoogleCloudRecommenderV1beta1ValueMatcher + */ + public function setValueMatcher(Google_Service_Recommender_GoogleCloudRecommenderV1beta1ValueMatcher $valueMatcher) + { + $this->valueMatcher = $valueMatcher; + } + /** + * @return Google_Service_Recommender_GoogleCloudRecommenderV1beta1ValueMatcher + */ + public function getValueMatcher() + { + return $this->valueMatcher; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1OperationGroup.php b/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1OperationGroup.php new file mode 100644 index 0000000..390bfea --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1OperationGroup.php @@ -0,0 +1,38 @@ +operations = $operations; + } + /** + * @return Google_Service_Recommender_GoogleCloudRecommenderV1beta1Operation + */ + public function getOperations() + { + return $this->operations; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1Recommendation.php b/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1Recommendation.php new file mode 100644 index 0000000..6573f2e --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1Recommendation.php @@ -0,0 +1,131 @@ +additionalImpact = $additionalImpact; + } + /** + * @return Google_Service_Recommender_GoogleCloudRecommenderV1beta1Impact + */ + public function getAdditionalImpact() + { + return $this->additionalImpact; + } + /** + * @param Google_Service_Recommender_GoogleCloudRecommenderV1beta1RecommendationContent + */ + public function setContent(Google_Service_Recommender_GoogleCloudRecommenderV1beta1RecommendationContent $content) + { + $this->content = $content; + } + /** + * @return Google_Service_Recommender_GoogleCloudRecommenderV1beta1RecommendationContent + */ + public function getContent() + { + return $this->content; + } + public function setDescription($description) + { + $this->description = $description; + } + public function getDescription() + { + return $this->description; + } + public function setEtag($etag) + { + $this->etag = $etag; + } + public function getEtag() + { + return $this->etag; + } + public function setLastRefreshTime($lastRefreshTime) + { + $this->lastRefreshTime = $lastRefreshTime; + } + public function getLastRefreshTime() + { + return $this->lastRefreshTime; + } + public function setName($name) + { + $this->name = $name; + } + public function getName() + { + return $this->name; + } + /** + * @param Google_Service_Recommender_GoogleCloudRecommenderV1beta1Impact + */ + public function setPrimaryImpact(Google_Service_Recommender_GoogleCloudRecommenderV1beta1Impact $primaryImpact) + { + $this->primaryImpact = $primaryImpact; + } + /** + * @return Google_Service_Recommender_GoogleCloudRecommenderV1beta1Impact + */ + public function getPrimaryImpact() + { + return $this->primaryImpact; + } + public function setRecommenderSubtype($recommenderSubtype) + { + $this->recommenderSubtype = $recommenderSubtype; + } + public function getRecommenderSubtype() + { + return $this->recommenderSubtype; + } + /** + * @param Google_Service_Recommender_GoogleCloudRecommenderV1beta1RecommendationStateInfo + */ + public function setStateInfo(Google_Service_Recommender_GoogleCloudRecommenderV1beta1RecommendationStateInfo $stateInfo) + { + $this->stateInfo = $stateInfo; + } + /** + * @return Google_Service_Recommender_GoogleCloudRecommenderV1beta1RecommendationStateInfo + */ + public function getStateInfo() + { + return $this->stateInfo; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1RecommendationContent.php b/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1RecommendationContent.php new file mode 100644 index 0000000..c5a489b --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1RecommendationContent.php @@ -0,0 +1,38 @@ +operationGroups = $operationGroups; + } + /** + * @return Google_Service_Recommender_GoogleCloudRecommenderV1beta1OperationGroup + */ + public function getOperationGroups() + { + return $this->operationGroups; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1OperationMetadata.php b/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1RecommendationStateInfo.php similarity index 63% rename from vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1OperationMetadata.php rename to vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1RecommendationStateInfo.php index 3d66d2f..861400b 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1OperationMetadata.php +++ b/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1RecommendationStateInfo.php @@ -15,20 +15,11 @@ * the License. */ -class Google_Service_Vision_GoogleCloudVisionV1p5beta1OperationMetadata extends Google_Model +class Google_Service_Recommender_GoogleCloudRecommenderV1beta1RecommendationStateInfo extends Google_Model { - public $createTime; public $state; - public $updateTime; + public $stateMetadata; - public function setCreateTime($createTime) - { - $this->createTime = $createTime; - } - public function getCreateTime() - { - return $this->createTime; - } public function setState($state) { $this->state = $state; @@ -37,12 +28,12 @@ class Google_Service_Vision_GoogleCloudVisionV1p5beta1OperationMetadata extends { return $this->state; } - public function setUpdateTime($updateTime) + public function setStateMetadata($stateMetadata) { - $this->updateTime = $updateTime; + $this->stateMetadata = $stateMetadata; } - public function getUpdateTime() + public function getStateMetadata() { - return $this->updateTime; + return $this->stateMetadata; } } diff --git a/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1ValueMatcher.php b/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1ValueMatcher.php new file mode 100644 index 0000000..feca459 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleCloudRecommenderV1beta1ValueMatcher.php @@ -0,0 +1,30 @@ +matchesPattern = $matchesPattern; + } + public function getMatchesPattern() + { + return $this->matchesPattern; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleTypeMoney.php b/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleTypeMoney.php new file mode 100644 index 0000000..9430f69 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Recommender/GoogleTypeMoney.php @@ -0,0 +1,48 @@ +currencyCode = $currencyCode; + } + public function getCurrencyCode() + { + return $this->currencyCode; + } + public function setNanos($nanos) + { + $this->nanos = $nanos; + } + public function getNanos() + { + return $this->nanos; + } + public function setUnits($units) + { + $this->units = $units; + } + public function getUnits() + { + return $this->units; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Recommender/Resource/Projects.php b/vendor/google/apiclient-services/src/Google/Service/Recommender/Resource/Projects.php new file mode 100644 index 0000000..0372ed7 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Recommender/Resource/Projects.php @@ -0,0 +1,28 @@ + + * $recommenderService = new Google_Service_Recommender(...); + * $projects = $recommenderService->projects; + * + */ +class Google_Service_Recommender_Resource_Projects extends Google_Service_Resource +{ +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Recommender/Resource/ProjectsLocations.php b/vendor/google/apiclient-services/src/Google/Service/Recommender/Resource/ProjectsLocations.php new file mode 100644 index 0000000..4622f71 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Recommender/Resource/ProjectsLocations.php @@ -0,0 +1,28 @@ + + * $recommenderService = new Google_Service_Recommender(...); + * $locations = $recommenderService->locations; + * + */ +class Google_Service_Recommender_Resource_ProjectsLocations extends Google_Service_Resource +{ +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Recommender/Resource/ProjectsLocationsRecommenders.php b/vendor/google/apiclient-services/src/Google/Service/Recommender/Resource/ProjectsLocationsRecommenders.php new file mode 100644 index 0000000..9d1b44e --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Recommender/Resource/ProjectsLocationsRecommenders.php @@ -0,0 +1,28 @@ + + * $recommenderService = new Google_Service_Recommender(...); + * $recommenders = $recommenderService->recommenders; + * + */ +class Google_Service_Recommender_Resource_ProjectsLocationsRecommenders extends Google_Service_Resource +{ +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Recommender/Resource/ProjectsLocationsRecommendersRecommendations.php b/vendor/google/apiclient-services/src/Google/Service/Recommender/Resource/ProjectsLocationsRecommendersRecommendations.php new file mode 100644 index 0000000..b8cfe3c --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Recommender/Resource/ProjectsLocationsRecommendersRecommendations.php @@ -0,0 +1,144 @@ + + * $recommenderService = new Google_Service_Recommender(...); + * $recommendations = $recommenderService->recommendations; + * + */ +class Google_Service_Recommender_Resource_ProjectsLocationsRecommendersRecommendations extends Google_Service_Resource +{ + /** + * Gets the requested recommendation. Requires the recommender.*.get IAM + * permission for the specified recommender. (recommendations.get) + * + * @param string $name Name of the recommendation. + * @param array $optParams Optional parameters. + * @return Google_Service_Recommender_GoogleCloudRecommenderV1beta1Recommendation + */ + public function get($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('get', array($params), "Google_Service_Recommender_GoogleCloudRecommenderV1beta1Recommendation"); + } + /** + * Lists recommendations for a Cloud project. Requires the recommender.*.list + * IAM permission for the specified recommender. + * (recommendations.listProjectsLocationsRecommendersRecommendations) + * + * @param string $parent Required. The container resource on which to execute + * the request. Acceptable formats: + * + * 1. "projects/[PROJECT_NUMBER]/locations/[LOCATION]/recommenders/[RECOMMENDER_ + * ID]", + * + * LOCATION here refers to GCP Locations: + * https://cloud.google.com/about/locations/ + * @param array $optParams Optional parameters. + * + * @opt_param string pageToken Optional. If present, retrieves the next batch of + * results from the preceding call to this method. `page_token` must be the + * value of `next_page_token` from the previous response. The values of other + * method parameters must be identical to those in the previous call. + * @opt_param int pageSize Optional. The maximum number of results to return + * from this request. Non-positive values are ignored. If not specified, the + * server will determine the number of results to return. + * @opt_param string filter Filter expression to restrict the recommendations + * returned. Supported filter fields: state_info.state Eg: + * `state_info.state:"DISMISSED" or state_info.state:"FAILED" + * @return Google_Service_Recommender_GoogleCloudRecommenderV1beta1ListRecommendationsResponse + */ + public function listProjectsLocationsRecommendersRecommendations($parent, $optParams = array()) + { + $params = array('parent' => $parent); + $params = array_merge($params, $optParams); + return $this->call('list', array($params), "Google_Service_Recommender_GoogleCloudRecommenderV1beta1ListRecommendationsResponse"); + } + /** + * Mark the Recommendation State as Claimed. Users can use this method to + * indicate to the Recommender API that they are starting to apply the + * recommendation themselves. This stops the recommendation content from being + * updated. + * + * MarkRecommendationClaimed can be applied to recommendations in CLAIMED, + * SUCCEEDED, FAILED, or ACTIVE state. + * + * Requires the recommender.*.update IAM permission for the specified + * recommender. (recommendations.markClaimed) + * + * @param string $name Name of the recommendation. + * @param Google_Service_Recommender_GoogleCloudRecommenderV1beta1MarkRecommendationClaimedRequest $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_Recommender_GoogleCloudRecommenderV1beta1Recommendation + */ + public function markClaimed($name, Google_Service_Recommender_GoogleCloudRecommenderV1beta1MarkRecommendationClaimedRequest $postBody, $optParams = array()) + { + $params = array('name' => $name, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('markClaimed', array($params), "Google_Service_Recommender_GoogleCloudRecommenderV1beta1Recommendation"); + } + /** + * Mark the Recommendation State as Failed. Users can use this method to + * indicate to the Recommender API that they have applied the recommendation + * themselves, and the operation failed. This stops the recommendation content + * from being updated. + * + * MarkRecommendationFailed can be applied to recommendations in ACTIVE, + * CLAIMED, SUCCEEDED, or FAILED state. + * + * Requires the recommender.*.update IAM permission for the specified + * recommender. (recommendations.markFailed) + * + * @param string $name Name of the recommendation. + * @param Google_Service_Recommender_GoogleCloudRecommenderV1beta1MarkRecommendationFailedRequest $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_Recommender_GoogleCloudRecommenderV1beta1Recommendation + */ + public function markFailed($name, Google_Service_Recommender_GoogleCloudRecommenderV1beta1MarkRecommendationFailedRequest $postBody, $optParams = array()) + { + $params = array('name' => $name, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('markFailed', array($params), "Google_Service_Recommender_GoogleCloudRecommenderV1beta1Recommendation"); + } + /** + * Mark the Recommendation State as Succeeded. Users can use this method to + * indicate to the Recommender API that they have applied the recommendation + * themselves, and the operation was successful. This stops the recommendation + * content from being updated. + * + * MarkRecommendationSucceeded can be applied to recommendations in ACTIVE, + * CLAIMED, SUCCEEDED, or FAILED state. + * + * Requires the recommender.*.update IAM permission for the specified + * recommender. (recommendations.markSucceeded) + * + * @param string $name Name of the recommendation. + * @param Google_Service_Recommender_GoogleCloudRecommenderV1beta1MarkRecommendationSucceededRequest $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_Recommender_GoogleCloudRecommenderV1beta1Recommendation + */ + public function markSucceeded($name, Google_Service_Recommender_GoogleCloudRecommenderV1beta1MarkRecommendationSucceededRequest $postBody, $optParams = array()) + { + $params = array('name' => $name, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('markSucceeded', array($params), "Google_Service_Recommender_GoogleCloudRecommenderV1beta1Recommendation"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution.php b/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution.php index 895a143..fde37be 100644 --- a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution.php +++ b/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution.php @@ -80,11 +80,6 @@ class Google_Service_RemoteBuildExecution extends Google_Service 'type' => 'string', 'required' => true, ), - 'inlineOutputFiles' => array( - 'location' => 'query', - 'type' => 'string', - 'repeated' => true, - ), 'inlineStdout' => array( 'location' => 'query', 'type' => 'boolean', @@ -93,6 +88,11 @@ class Google_Service_RemoteBuildExecution extends Google_Service 'location' => 'query', 'type' => 'boolean', ), + 'inlineOutputFiles' => array( + 'location' => 'query', + 'type' => 'string', + 'repeated' => true, + ), ), ),'update' => array( 'path' => 'v2/{+instanceName}/actionResults/{hash}/{sizeBytes}', diff --git a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemotebuildbotCommandDurations.php b/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemotebuildbotCommandDurations.php index f224d4d..be617f9 100644 --- a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemotebuildbotCommandDurations.php +++ b/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemotebuildbotCommandDurations.php @@ -18,12 +18,16 @@ class Google_Service_RemoteBuildExecution_GoogleDevtoolsRemotebuildbotCommandDurations extends Google_Model { public $dockerPrep; + public $dockerPrepStartTime; public $download; + public $downloadStartTime; + public $execStartTime; public $execution; public $isoPrepDone; public $overall; public $stdout; public $upload; + public $uploadStartTime; public function setDockerPrep($dockerPrep) { @@ -33,6 +37,14 @@ class Google_Service_RemoteBuildExecution_GoogleDevtoolsRemotebuildbotCommandDur { return $this->dockerPrep; } + public function setDockerPrepStartTime($dockerPrepStartTime) + { + $this->dockerPrepStartTime = $dockerPrepStartTime; + } + public function getDockerPrepStartTime() + { + return $this->dockerPrepStartTime; + } public function setDownload($download) { $this->download = $download; @@ -41,6 +53,22 @@ class Google_Service_RemoteBuildExecution_GoogleDevtoolsRemotebuildbotCommandDur { return $this->download; } + public function setDownloadStartTime($downloadStartTime) + { + $this->downloadStartTime = $downloadStartTime; + } + public function getDownloadStartTime() + { + return $this->downloadStartTime; + } + public function setExecStartTime($execStartTime) + { + $this->execStartTime = $execStartTime; + } + public function getExecStartTime() + { + return $this->execStartTime; + } public function setExecution($execution) { $this->execution = $execution; @@ -81,4 +109,12 @@ class Google_Service_RemoteBuildExecution_GoogleDevtoolsRemotebuildbotCommandDur { return $this->upload; } + public function setUploadStartTime($uploadStartTime) + { + $this->uploadStartTime = $uploadStartTime; + } + public function getUploadStartTime() + { + return $this->uploadStartTime; + } } diff --git a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemotebuildexecutionAdminV1alphaWorkerConfig.php b/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemotebuildexecutionAdminV1alphaWorkerConfig.php index 4e28005..fa49225 100644 --- a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemotebuildexecutionAdminV1alphaWorkerConfig.php +++ b/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemotebuildexecutionAdminV1alphaWorkerConfig.php @@ -24,6 +24,7 @@ class Google_Service_RemoteBuildExecution_GoogleDevtoolsRemotebuildexecutionAdmi public $labels; public $machineType; public $minCpuPlatform; + public $networkAccess; public $reserved; /** @@ -80,6 +81,14 @@ class Google_Service_RemoteBuildExecution_GoogleDevtoolsRemotebuildexecutionAdmi { return $this->minCpuPlatform; } + public function setNetworkAccess($networkAccess) + { + $this->networkAccess = $networkAccess; + } + public function getNetworkAccess() + { + return $this->networkAccess; + } public function setReserved($reserved) { $this->reserved = $reserved; diff --git a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testActionResult.php b/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testActionResult.php deleted file mode 100644 index 34ec09c..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testActionResult.php +++ /dev/null @@ -1,113 +0,0 @@ -exitCode = $exitCode; - } - public function getExitCode() - { - return $this->exitCode; - } - /** - * @param Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testOutputDirectory - */ - public function setOutputDirectories($outputDirectories) - { - $this->outputDirectories = $outputDirectories; - } - /** - * @return Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testOutputDirectory - */ - public function getOutputDirectories() - { - return $this->outputDirectories; - } - /** - * @param Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testOutputFile - */ - public function setOutputFiles($outputFiles) - { - $this->outputFiles = $outputFiles; - } - /** - * @return Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testOutputFile - */ - public function getOutputFiles() - { - return $this->outputFiles; - } - /** - * @param Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testDigest - */ - public function setStderrDigest(Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testDigest $stderrDigest) - { - $this->stderrDigest = $stderrDigest; - } - /** - * @return Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testDigest - */ - public function getStderrDigest() - { - return $this->stderrDigest; - } - public function setStderrRaw($stderrRaw) - { - $this->stderrRaw = $stderrRaw; - } - public function getStderrRaw() - { - return $this->stderrRaw; - } - /** - * @param Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testDigest - */ - public function setStdoutDigest(Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testDigest $stdoutDigest) - { - $this->stdoutDigest = $stdoutDigest; - } - /** - * @return Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testDigest - */ - public function getStdoutDigest() - { - return $this->stdoutDigest; - } - public function setStdoutRaw($stdoutRaw) - { - $this->stdoutRaw = $stdoutRaw; - } - public function getStdoutRaw() - { - return $this->stdoutRaw; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testCommand.php b/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testCommand.php deleted file mode 100644 index e2188cc..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testCommand.php +++ /dev/null @@ -1,47 +0,0 @@ -arguments = $arguments; - } - public function getArguments() - { - return $this->arguments; - } - /** - * @param Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testCommandEnvironmentVariable - */ - public function setEnvironmentVariables($environmentVariables) - { - $this->environmentVariables = $environmentVariables; - } - /** - * @return Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testCommandEnvironmentVariable - */ - public function getEnvironmentVariables() - { - return $this->environmentVariables; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testDigest.php b/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testDigest.php deleted file mode 100644 index 6b28839..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testDigest.php +++ /dev/null @@ -1,39 +0,0 @@ -hash = $hash; - } - public function getHash() - { - return $this->hash; - } - public function setSizeBytes($sizeBytes) - { - $this->sizeBytes = $sizeBytes; - } - public function getSizeBytes() - { - return $this->sizeBytes; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testDirectory.php b/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testDirectory.php deleted file mode 100644 index a72040b..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testDirectory.php +++ /dev/null @@ -1,54 +0,0 @@ -directories = $directories; - } - /** - * @return Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testDirectoryNode - */ - public function getDirectories() - { - return $this->directories; - } - /** - * @param Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testFileNode - */ - public function setFiles($files) - { - $this->files = $files; - } - /** - * @return Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testFileNode - */ - public function getFiles() - { - return $this->files; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testExecuteOperationMetadata.php b/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testExecuteOperationMetadata.php deleted file mode 100644 index 532ebf3..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testExecuteOperationMetadata.php +++ /dev/null @@ -1,64 +0,0 @@ -actionDigest = $actionDigest; - } - /** - * @return Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testDigest - */ - public function getActionDigest() - { - return $this->actionDigest; - } - public function setStage($stage) - { - $this->stage = $stage; - } - public function getStage() - { - return $this->stage; - } - public function setStderrStreamName($stderrStreamName) - { - $this->stderrStreamName = $stderrStreamName; - } - public function getStderrStreamName() - { - return $this->stderrStreamName; - } - public function setStdoutStreamName($stdoutStreamName) - { - $this->stdoutStreamName = $stdoutStreamName; - } - public function getStdoutStreamName() - { - return $this->stdoutStreamName; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testExecuteResponse.php b/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testExecuteResponse.php deleted file mode 100644 index b2ef828..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testExecuteResponse.php +++ /dev/null @@ -1,78 +0,0 @@ -cachedResult = $cachedResult; - } - public function getCachedResult() - { - return $this->cachedResult; - } - /** - * @param Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testActionResult - */ - public function setResult(Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testActionResult $result) - { - $this->result = $result; - } - /** - * @return Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testActionResult - */ - public function getResult() - { - return $this->result; - } - /** - * @param Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testLogFile - */ - public function setServerLogs($serverLogs) - { - $this->serverLogs = $serverLogs; - } - /** - * @return Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testLogFile - */ - public function getServerLogs() - { - return $this->serverLogs; - } - /** - * @param Google_Service_RemoteBuildExecution_GoogleRpcStatus - */ - public function setStatus(Google_Service_RemoteBuildExecution_GoogleRpcStatus $status) - { - $this->status = $status; - } - /** - * @return Google_Service_RemoteBuildExecution_GoogleRpcStatus - */ - public function getStatus() - { - return $this->status; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testFileNode.php b/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testFileNode.php deleted file mode 100644 index 0b0f4f3..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testFileNode.php +++ /dev/null @@ -1,55 +0,0 @@ -digest = $digest; - } - /** - * @return Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testDigest - */ - public function getDigest() - { - return $this->digest; - } - public function setIsExecutable($isExecutable) - { - $this->isExecutable = $isExecutable; - } - public function getIsExecutable() - { - return $this->isExecutable; - } - public function setName($name) - { - $this->name = $name; - } - public function getName() - { - return $this->name; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testLogFile.php b/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testLogFile.php deleted file mode 100644 index 55b21bf..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testLogFile.php +++ /dev/null @@ -1,46 +0,0 @@ -digest = $digest; - } - /** - * @return Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testDigest - */ - public function getDigest() - { - return $this->digest; - } - public function setHumanReadable($humanReadable) - { - $this->humanReadable = $humanReadable; - } - public function getHumanReadable() - { - return $this->humanReadable; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testOutputDirectory.php b/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testOutputDirectory.php deleted file mode 100644 index b4a38cf..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testOutputDirectory.php +++ /dev/null @@ -1,62 +0,0 @@ -digest = $digest; - } - /** - * @return Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testDigest - */ - public function getDigest() - { - return $this->digest; - } - public function setPath($path) - { - $this->path = $path; - } - public function getPath() - { - return $this->path; - } - /** - * @param Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testDigest - */ - public function setTreeDigest(Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testDigest $treeDigest) - { - $this->treeDigest = $treeDigest; - } - /** - * @return Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testDigest - */ - public function getTreeDigest() - { - return $this->treeDigest; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testOutputFile.php b/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testOutputFile.php deleted file mode 100644 index 957f6c1..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testOutputFile.php +++ /dev/null @@ -1,64 +0,0 @@ -content = $content; - } - public function getContent() - { - return $this->content; - } - /** - * @param Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testDigest - */ - public function setDigest(Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testDigest $digest) - { - $this->digest = $digest; - } - /** - * @return Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testDigest - */ - public function getDigest() - { - return $this->digest; - } - public function setIsExecutable($isExecutable) - { - $this->isExecutable = $isExecutable; - } - public function getIsExecutable() - { - return $this->isExecutable; - } - public function setPath($path) - { - $this->path = $path; - } - public function getPath() - { - return $this->path; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testRequestMetadata.php b/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testRequestMetadata.php deleted file mode 100644 index 1830ff5..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testRequestMetadata.php +++ /dev/null @@ -1,64 +0,0 @@ -actionId = $actionId; - } - public function getActionId() - { - return $this->actionId; - } - public function setCorrelatedInvocationsId($correlatedInvocationsId) - { - $this->correlatedInvocationsId = $correlatedInvocationsId; - } - public function getCorrelatedInvocationsId() - { - return $this->correlatedInvocationsId; - } - /** - * @param Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testToolDetails - */ - public function setToolDetails(Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testToolDetails $toolDetails) - { - $this->toolDetails = $toolDetails; - } - /** - * @return Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testToolDetails - */ - public function getToolDetails() - { - return $this->toolDetails; - } - public function setToolInvocationId($toolInvocationId) - { - $this->toolInvocationId = $toolInvocationId; - } - public function getToolInvocationId() - { - return $this->toolInvocationId; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testToolDetails.php b/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testToolDetails.php deleted file mode 100644 index f9d148e..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testToolDetails.php +++ /dev/null @@ -1,39 +0,0 @@ -toolName = $toolName; - } - public function getToolName() - { - return $this->toolName; - } - public function setToolVersion($toolVersion) - { - $this->toolVersion = $toolVersion; - } - public function getToolVersion() - { - return $this->toolVersion; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testTree.php b/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testTree.php deleted file mode 100644 index 6500d37..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/GoogleDevtoolsRemoteexecutionV1testTree.php +++ /dev/null @@ -1,54 +0,0 @@ -children = $children; - } - /** - * @return Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testDirectory - */ - public function getChildren() - { - return $this->children; - } - /** - * @param Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testDirectory - */ - public function setRoot(Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testDirectory $root) - { - $this->root = $root; - } - /** - * @return Google_Service_RemoteBuildExecution_GoogleDevtoolsRemoteexecutionV1testDirectory - */ - public function getRoot() - { - return $this->root; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/Resource/ActionResults.php b/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/Resource/ActionResults.php index 3d4724d..8632ded 100644 --- a/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/Resource/ActionResults.php +++ b/vendor/google/apiclient-services/src/Google/Service/RemoteBuildExecution/Resource/ActionResults.php @@ -48,13 +48,13 @@ class Google_Service_RemoteBuildExecution_Resource_ActionResults extends Google_ * @param string $sizeBytes The size of the blob, in bytes. * @param array $optParams Optional parameters. * - * @opt_param string inlineOutputFiles A hint to the server to inline the - * contents of the listed output files. Each path needs to exactly match one - * path in `output_files` in the Command message. * @opt_param bool inlineStdout A hint to the server to request inlining stdout * in the ActionResult message. * @opt_param bool inlineStderr A hint to the server to request inlining stderr * in the ActionResult message. + * @opt_param string inlineOutputFiles A hint to the server to inline the + * contents of the listed output files. Each path needs to exactly match one + * path in `output_files` in the Command message. * @return Google_Service_RemoteBuildExecution_BuildBazelRemoteExecutionV2ActionResult */ public function get($instanceName, $hash, $sizeBytes, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Reports.php b/vendor/google/apiclient-services/src/Google/Service/Reports.php index 3eef9c5..72b8d5a 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Reports.php +++ b/vendor/google/apiclient-services/src/Google/Service/Reports.php @@ -24,7 +24,7 @@ * *

* For more information about this service, see the API - * Documentation + * Documentation *

* * @author Google, Inc. diff --git a/vendor/google/apiclient-services/src/Google/Service/Reports/Resource/Activities.php b/vendor/google/apiclient-services/src/Google/Service/Reports/Resource/Activities.php index fbc0bab..5eacf2f 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Reports/Resource/Activities.php +++ b/vendor/google/apiclient-services/src/Google/Service/Reports/Resource/Activities.php @@ -26,33 +26,102 @@ class Google_Service_Reports_Resource_Activities extends Google_Service_Resource { /** - * Retrieves a list of activities for a specific customer and application. + * Retrieves a list of activities for a specific customer's account and + * application such as the Admin console application or the Google Drive + * application. For more information, see the guides for administrator and + * Google Drive activity reports. For more information about the activity + * report's parameters, see the activity parameters reference guides. * (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 $userKey Represents the profile ID or the user email for which + * the data should be filtered. * @param string $applicationName Application name for which the events are to * be retrieved. * @param array $optParams Optional parameters. * - * @opt_param string actorIpAddress IP Address of host where the event was - * performed. Supports both IPv4 and IPv6 addresses. - * @opt_param string customerId Represents the customer for which the data is to - * be fetched. - * @opt_param string endTime Return events which occurred at or before this - * time. - * @opt_param string eventName Name of the event being queried. - * @opt_param string filters Event parameters in the form [parameter1 - * name][operator][parameter1 value],[parameter2 name][operator][parameter2 - * value],... - * @opt_param int maxResults Number of activity records to be shown in each - * page. - * @opt_param string orgUnitID the organizational unit's(OU) ID to filter - * activities from users belonging to a specific OU or one of its sub-OU(s) - * @opt_param string pageToken Token to specify next page. - * @opt_param string startTime Return events which occurred at or after this - * time. + * @opt_param string actorIpAddress The Internet Protocol (IP) Address of host + * where the event was performed. This is an additional way to filter a report's + * summary using the IP address of the user whose activity is being reported. + * This IP address may or may not reflect the user's physical location. For + * example, the IP address can be the user's proxy server's address or a virtual + * private network (VPN) address. This parameter supports both IPv4 and IPv6 + * address versions. + * @opt_param string customerId The unique ID of the customer to retrieve data + * for. + * @opt_param string endTime Sets the end of the range of time shown in the + * report. The date is in the RFC 3339 format, for example + * 2010-10-28T10:26:35.000Z. The default value is the approximate time of the + * API request. An API report has three basic time concepts: - Date of the API's + * request for a report: When the API created and retrieved the report. - + * Report's start time: The beginning of the timespan shown in the report. The + * startTime must be before the endTime (if specified) and the current time when + * the request is made, or the API returns an error. - Report's end time: The + * end of the timespan shown in the report. For example, the timespan of events + * summarized in a report can start in April and end in May. The report itself + * can be requested in August. If the endTime is not specified, the report + * returns all activities from the startTime until the current time or the most + * recent 180 days if the startTime is more than 180 days in the past. + * @opt_param string eventName The name of the event being queried by the API. + * Each eventName is related to a specific G Suite service or feature which the + * API organizes into types of events. An example is the Google Calendar events + * in the Admin console application's reports. The Calendar Settings type + * structure has all of the Calendar eventName activities reported by the API. + * When an administrator changes a Calendar setting, the API reports this + * activity in the Calendar Settings type and eventName parameters. For more + * information about eventName query strings and parameters, see the list of + * event names for various applications above in applicationName. + * @opt_param string filters The filters query string is a comma-separated list. + * The list is composed of event parameters that are manipulated by relational + * operators. Event parameters are in the form [parameter1 name][relational + * operator][parameter1 value],[parameter2 name][relational operator][parameter2 + * value],... These event parameters are associated with a specific eventName. + * An empty report is returned if the filtered request's parameter does not + * belong to the eventName. For more information about eventName parameters, see + * the list of event names for various applications above in applicationName. + * + * In the following Admin Activity example, the <> operator is URL-encoded in + * the request's query string (%3C%3E): GET...=CHANGE_CALENDAR_SETTING + * =NEW_VALUE%3C%3EREAD_ONLY_ACCESS + * + * In the following Drive example, the list can be a view or edit event's doc_id + * parameter with a value that is manipulated by an 'equal to' (==) or 'not + * equal to' (<>) relational operator. In the first example, the report returns + * each edited document's doc_id. In the second example, the report returns each + * viewed document's doc_id that equals the value 12345 and does not return any + * viewed document's which have a doc_id value of 98765. The <> operator is URL- + * encoded in the request's query string (%3C%3E): + * + * GET...=edit=doc_id GET...=view=doc_id==12345,doc_id%3C%3E98765 + * + * The relational operators include: - == - 'equal to'. - <> - 'not equal + * to'. It is URL-encoded (%3C%3E). - < - 'less than'. It is URL-encoded (%3C). + * - <= - 'less than or equal to'. It is URL-encoded (%3C=). - > - 'greater + * than'. It is URL-encoded (%3E). - >= - 'greater than or equal to'. It is + * URL-encoded (%3E=). Note: The API doesn't accept multiple values of a + * parameter. If a particular parameter is supplied more than once in the API + * request, the API only accepts the last value of that request parameter. In + * addition, if an invalid request parameter is supplied in the API request, the + * API ignores that request parameter and returns the response corresponding to + * the remaining valid request parameters. If no parameters are requested, all + * parameters are returned. + * @opt_param int maxResults Determines how many activity records are shown on + * each response page. For example, if the request sets maxResults=1 and the + * report has two activities, the report has two pages. The response's + * nextPageToken property has the token to the second page. The maxResults query + * string is optional in the request. The default value is 1000. + * @opt_param string orgUnitID ID of the organizational unit to report on. + * Activity records will be shown only for users who belong to the specified + * organizational unit. Data before Dec 17, 2018 doesn't appear in the filtered + * results. + * @opt_param string pageToken The token to specify next page. A report with + * multiple pages has a nextPageToken property in the response. In your follow- + * on request getting the next page of the report, enter the nextPageToken value + * in the pageToken query string. + * @opt_param string startTime Sets the beginning of the range of time shown in + * the report. The date is in the RFC 3339 format, for example + * 2010-10-28T10:26:35.000Z. The report returns all activities from startTime + * until endTime. The startTime must be before the endTime (if specified) and + * the current time when the request is made, or the API returns an error. * @return Google_Service_Reports_Activities */ public function listActivities($userKey, $applicationName, $optParams = array()) @@ -62,33 +131,99 @@ class Google_Service_Reports_Resource_Activities extends Google_Service_Resource return $this->call('list', array($params), "Google_Service_Reports_Activities"); } /** - * Push changes to activities (activities.watch) + * Start receiving notifications for account activities. For more information, + * see Receiving Push Notifications. (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 $userKey Represents the profile ID or the user email for which + * the data should be filtered. * @param string $applicationName Application name for which the events are to * be retrieved. * @param Google_Service_Reports_Channel $postBody * @param array $optParams Optional parameters. * - * @opt_param string actorIpAddress IP Address of host where the event was - * performed. Supports both IPv4 and IPv6 addresses. - * @opt_param string customerId Represents the customer for which the data is to - * be fetched. - * @opt_param string endTime Return events which occurred at or before this - * time. - * @opt_param string eventName Name of the event being queried. - * @opt_param string filters Event parameters in the form [parameter1 - * name][operator][parameter1 value],[parameter2 name][operator][parameter2 - * value],... - * @opt_param int maxResults Number of activity records to be shown in each - * page. - * @opt_param string orgUnitID the organizational unit's(OU) ID to filter - * activities from users belonging to a specific OU or one of its sub-OU(s) - * @opt_param string pageToken Token to specify next page. - * @opt_param string startTime Return events which occurred at or after this - * time. + * @opt_param string actorIpAddress The Internet Protocol (IP) Address of host + * where the event was performed. This is an additional way to filter a report's + * summary using the IP address of the user whose activity is being reported. + * This IP address may or may not reflect the user's physical location. For + * example, the IP address can be the user's proxy server's address or a virtual + * private network (VPN) address. This parameter supports both IPv4 and IPv6 + * address versions. + * @opt_param string customerId The unique ID of the customer to retrieve data + * for. + * @opt_param string endTime Sets the end of the range of time shown in the + * report. The date is in the RFC 3339 format, for example + * 2010-10-28T10:26:35.000Z. The default value is the approximate time of the + * API request. An API report has three basic time concepts: - Date of the API's + * request for a report: When the API created and retrieved the report. - + * Report's start time: The beginning of the timespan shown in the report. The + * startTime must be before the endTime (if specified) and the current time when + * the request is made, or the API returns an error. - Report's end time: The + * end of the timespan shown in the report. For example, the timespan of events + * summarized in a report can start in April and end in May. The report itself + * can be requested in August. If the endTime is not specified, the report + * returns all activities from the startTime until the current time or the most + * recent 180 days if the startTime is more than 180 days in the past. + * @opt_param string eventName The name of the event being queried by the API. + * Each eventName is related to a specific G Suite service or feature which the + * API organizes into types of events. An example is the Google Calendar events + * in the Admin console application's reports. The Calendar Settings type + * structure has all of the Calendar eventName activities reported by the API. + * When an administrator changes a Calendar setting, the API reports this + * activity in the Calendar Settings type and eventName parameters. For more + * information about eventName query strings and parameters, see the list of + * event names for various applications above in applicationName. + * @opt_param string filters The filters query string is a comma-separated list. + * The list is composed of event parameters that are manipulated by relational + * operators. Event parameters are in the form [parameter1 name][relational + * operator][parameter1 value],[parameter2 name][relational operator][parameter2 + * value],... These event parameters are associated with a specific eventName. + * An empty report is returned if the filtered request's parameter does not + * belong to the eventName. For more information about eventName parameters, see + * the list of event names for various applications above in applicationName. + * + * In the following Admin Activity example, the <> operator is URL-encoded in + * the request's query string (%3C%3E): GET...=CHANGE_CALENDAR_SETTING + * =NEW_VALUE%3C%3EREAD_ONLY_ACCESS + * + * In the following Drive example, the list can be a view or edit event's doc_id + * parameter with a value that is manipulated by an 'equal to' (==) or 'not + * equal to' (<>) relational operator. In the first example, the report returns + * each edited document's doc_id. In the second example, the report returns each + * viewed document's doc_id that equals the value 12345 and does not return any + * viewed document's which have a doc_id value of 98765. The <> operator is URL- + * encoded in the request's query string (%3C%3E): + * + * GET...=edit=doc_id GET...=view=doc_id==12345,doc_id%3C%3E98765 + * + * The relational operators include: - == - 'equal to'. - <> - 'not equal + * to'. It is URL-encoded (%3C%3E). - < - 'less than'. It is URL-encoded (%3C). + * - <= - 'less than or equal to'. It is URL-encoded (%3C=). - > - 'greater + * than'. It is URL-encoded (%3E). - >= - 'greater than or equal to'. It is + * URL-encoded (%3E=). Note: The API doesn't accept multiple values of a + * parameter. If a particular parameter is supplied more than once in the API + * request, the API only accepts the last value of that request parameter. In + * addition, if an invalid request parameter is supplied in the API request, the + * API ignores that request parameter and returns the response corresponding to + * the remaining valid request parameters. If no parameters are requested, all + * parameters are returned. + * @opt_param int maxResults Determines how many activity records are shown on + * each response page. For example, if the request sets maxResults=1 and the + * report has two activities, the report has two pages. The response's + * nextPageToken property has the token to the second page. The maxResults query + * string is optional in the request. The default value is 1000. + * @opt_param string orgUnitID ID of the organizational unit to report on. + * Activity records will be shown only for users who belong to the specified + * organizational unit. Data before Dec 17, 2018 doesn't appear in the filtered + * results. + * @opt_param string pageToken The token to specify next page. A report with + * multiple pages has a nextPageToken property in the response. In your follow- + * on request getting the next page of the report, enter the nextPageToken value + * in the pageToken query string. + * @opt_param string startTime Sets the beginning of the range of time shown in + * the report. The date is in the RFC 3339 format, for example + * 2010-10-28T10:26:35.000Z. The report returns all activities from startTime + * until endTime. The startTime must be before the endTime (if specified) and + * the current time when the request is made, or the API returns an error. * @return Google_Service_Reports_Channel */ public function watch($userKey, $applicationName, Google_Service_Reports_Channel $postBody, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Reports/Resource/CustomerUsageReports.php b/vendor/google/apiclient-services/src/Google/Service/Reports/Resource/CustomerUsageReports.php index a1e7999..25eaef4 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Reports/Resource/CustomerUsageReports.php +++ b/vendor/google/apiclient-services/src/Google/Service/Reports/Resource/CustomerUsageReports.php @@ -26,18 +26,38 @@ class Google_Service_Reports_Resource_CustomerUsageReports extends Google_Service_Resource { /** - * Retrieves a report which is a collection of properties / statistics for a - * specific customer. (customerUsageReports.get) + * Retrieves a report which is a collection of properties and statistics for a + * specific customer's account. For more information, see the Customers Usage + * Report guide. For more information about the customer report's parameters, + * see the Customers Usage parameters reference guides. + * (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 the usage occurred. The timestamp is + * in the ISO 8601 format, yyyy-mm-dd. We recommend you use your account's time + * zone for this. * @param array $optParams Optional parameters. * - * @opt_param string customerId Represents the customer for which the data is to - * be fetched. - * @opt_param string pageToken Token to specify next page. - * @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 customerId The unique ID of the customer to retrieve data + * for. + * @opt_param string pageToken Token to specify next page. A report with + * multiple pages has a nextPageToken property in the response. For your follow- + * on requests getting all of the report's pages, enter the nextPageToken value + * in the pageToken query string. + * @opt_param string parameters The parameters query string is a comma-separated + * list of event parameters that refine a report's results. The parameter is + * associated with a specific application. The application values for the + * Customers usage report include accounts, app_maker, apps_scripts, calendar, + * classroom, cros, docs, gmail, gplus, device_management, meet, and sites. A + * parameters query string is in the CSV form of app_name1:param_name1, + * app_name2:param_name2. Note: The API doesn't accept multiple values of a + * parameter. If a particular parameter is supplied more than once in the API + * request, the API only accepts the last value of that request parameter. In + * addition, if an invalid request parameter is supplied in the API request, the + * API ignores that request parameter and returns the response corresponding to + * the remaining valid request parameters. + * + * An example of an invalid request parameter is one that does not belong to the + * application. If no parameters are requested, all parameters are returned. * @return Google_Service_Reports_UsageReports */ public function get($date, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Reports/Resource/EntityUsageReports.php b/vendor/google/apiclient-services/src/Google/Service/Reports/Resource/EntityUsageReports.php index b51db54..8514727 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Reports/Resource/EntityUsageReports.php +++ b/vendor/google/apiclient-services/src/Google/Service/Reports/Resource/EntityUsageReports.php @@ -26,26 +26,62 @@ class Google_Service_Reports_Resource_EntityUsageReports extends Google_Service_Resource { /** - * Retrieves a report which is a collection of properties / statistics for a set - * of objects. (entityUsageReports.get) + * Retrieves a report which is a collection of properties and statistics for + * entities used by users within the account. For more information, see the + * Entities Usage Report guide. For more information about the entities report's + * parameters, see the Entities Usage parameters reference guides. + * (entityUsageReports.get) * - * @param string $entityType Type of object. Should be one of - - * gplus_communities. - * @param string $entityKey Represents the key of object 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 $entityType Represents the type of entity for the report. + * @param string $entityKey Represents the key of the object to filter the data + * with. + * @param string $date Represents the date the usage occurred. The timestamp is + * in the ISO 8601 format, yyyy-mm-dd. We recommend you use your account's time + * zone for this. * @param array $optParams Optional parameters. * - * @opt_param string customerId Represents the customer for which the data is to - * be fetched. - * @opt_param string filters Represents the set of filters including parameter - * operator value. - * @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 parameters Represents the application name, parameter name - * pairs to fetch in csv as app_name1:param_name1, app_name2:param_name2. + * @opt_param string customerId The unique ID of the customer to retrieve data + * for. + * @opt_param string filters The filters query string is a comma-separated list + * of an application's event parameters where the parameter's value is + * manipulated by a relational operator. The filters query string includes the + * name of the application whose usage is returned in the report. The + * application values for the Entities usage report include accounts, docs, and + * gmail. Filters are in the form [application name]:[parameter name][relational + * operator][parameter value],.... + * + * In this example, the <> 'not equal to' operator is URL-encoded in the + * request's query string (%3C%3E): GET https://www.googleapis.com/admin/reports + * /v1/usage/gplus_communities/all/dates/2017-12-01 + * ?parameters=gplus:community_name,gplus:num_total_members + * =gplus:num_total_members>0 + * + * The relational operators include: - == - 'equal to'. - <> - 'not equal + * to'. It is URL-encoded (%3C%3E). - < - 'less than'. It is URL-encoded (%3C). + * - <= - 'less than or equal to'. It is URL-encoded (%3C=). - > - 'greater + * than'. It is URL-encoded (%3E). - >= - 'greater than or equal to'. It is + * URL-encoded (%3E=). Filters can only be applied to numeric parameters. + * @opt_param string maxResults Determines how many activity records are shown + * on each response page. For example, if the request sets maxResults=1 and the + * report has two activities, the report has two pages. The response's + * nextPageToken property has the token to the second page. + * @opt_param string pageToken Token to specify next page. A report with + * multiple pages has a nextPageToken property in the response. In your follow- + * on request getting the next page of the report, enter the nextPageToken value + * in the pageToken query string. + * @opt_param string parameters The parameters query string is a comma-separated + * list of event parameters that refine a report's results. The parameter is + * associated with a specific application. The application values for the + * Entities usage report are only gplus. A parameter query string is in the CSV + * form of [app_name1:param_name1], [app_name2:param_name2].... Note: The API + * doesn't accept multiple values of a parameter. If a particular parameter is + * supplied more than once in the API request, the API only accepts the last + * value of that request parameter. In addition, if an invalid request parameter + * is supplied in the API request, the API ignores that request parameter and + * returns the response corresponding to the remaining valid request parameters. + * + * An example of an invalid request parameter is one that does not belong to the + * application. If no parameters are requested, all parameters are returned. * @return Google_Service_Reports_UsageReports */ public function get($entityType, $entityKey, $date, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Reports/Resource/UserUsageReport.php b/vendor/google/apiclient-services/src/Google/Service/Reports/Resource/UserUsageReport.php index 39caa95..d9f95dc 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Reports/Resource/UserUsageReport.php +++ b/vendor/google/apiclient-services/src/Google/Service/Reports/Resource/UserUsageReport.php @@ -26,26 +26,67 @@ class Google_Service_Reports_Resource_UserUsageReport extends Google_Service_Resource { /** - * Retrieves a report which is a collection of properties / statistics for a set - * of users. (userUsageReport.get) + * Retrieves a report which is a collection of properties and statistics for a + * set of users with the account. For more information, see the User Usage + * Report guide. For more information about the user report's parameters, see + * the Users Usage parameters reference guides. (userUsageReport.get) * - * @param string $userKey Represents the profile id or the user email for which + * @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 $date Represents the date the usage occurred. The timestamp is + * in the ISO 8601 format, yyyy-mm-dd. We recommend you use your account's time + * zone for this. * @param array $optParams Optional parameters. * - * @opt_param string customerId Represents the customer for which the data is to - * be fetched. - * @opt_param string filters Represents the set of filters including parameter - * operator value. - * @opt_param string maxResults Maximum number of results to return. Maximum - * allowed is 1000 - * @opt_param string orgUnitID the organizational unit's ID to filter usage - * parameters from users belonging to a specific OU or one of its sub-OU(s). - * @opt_param string pageToken Token to specify next page. - * @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 customerId The unique ID of the customer to retrieve data + * for. + * @opt_param string filters The filters query string is a comma-separated list + * of an application's event parameters where the parameter's value is + * manipulated by a relational operator. The filters query string includes the + * name of the application whose usage is returned in the report. The + * application values for the Users Usage Report include accounts, docs, and + * gmail. Filters are in the form [application name]:[parameter name][relational + * operator][parameter value],.... + * + * In this example, the <> 'not equal to' operator is URL-encoded in the + * request's query string (%3C%3E): GET + * https://www.googleapis.com/admin/reports/v1/usage/users/all/dates/2013-03-03 + * ?parameters=accounts:last_login_time + * =accounts:last_login_time>2010-10-28T10:26:35.000Z + * + * The relational operators include: - == - 'equal to'. - <> - 'not equal + * to'. It is URL-encoded (%3C%3E). - < - 'less than'. It is URL-encoded (%3C). + * - <= - 'less than or equal to'. It is URL-encoded (%3C=). - > - 'greater + * than'. It is URL-encoded (%3E). - >= - 'greater than or equal to'. It is + * URL-encoded (%3E=). + * @opt_param string maxResults Determines how many activity records are shown + * on each response page. For example, if the request sets maxResults=1 and the + * report has two activities, the report has two pages. The response's + * nextPageToken property has the token to the second page. The maxResults query + * string is optional. + * @opt_param string orgUnitID ID of the organizational unit to report on. User + * activity will be shown only for users who belong to the specified + * organizational unit. Data before Dec 17, 2018 doesn't appear in the filtered + * results. + * @opt_param string pageToken Token to specify next page. A report with + * multiple pages has a nextPageToken property in the response. In your follow- + * on request getting the next page of the report, enter the nextPageToken value + * in the pageToken query string. + * @opt_param string parameters The parameters query string is a comma-separated + * list of event parameters that refine a report's results. The parameter is + * associated with a specific application. The application values for the + * Customers usage report include accounts, app_maker, apps_scripts, calendar, + * classroom, cros, docs, gmail, gplus, device_management, meet, and sites. A + * parameters query string is in the CSV form of app_name1:param_name1, + * app_name2:param_name2. Note: The API doesn't accept multiple values of a + * parameter. If a particular parameter is supplied more than once in the API + * request, the API only accepts the last value of that request parameter. In + * addition, if an invalid request parameter is supplied in the API request, the + * API ignores that request parameter and returns the response corresponding to + * the remaining valid request parameters. + * + * An example of an invalid request parameter is one that does not belong to the + * application. If no parameters are requested, all parameters are returned. * @return Google_Service_Reports_UsageReports */ public function get($userKey, $date, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/SQLAdmin/BackupRun.php b/vendor/google/apiclient-services/src/Google/Service/SQLAdmin/BackupRun.php index 9929948..32db522 100644 --- a/vendor/google/apiclient-services/src/Google/Service/SQLAdmin/BackupRun.php +++ b/vendor/google/apiclient-services/src/Google/Service/SQLAdmin/BackupRun.php @@ -18,6 +18,10 @@ class Google_Service_SQLAdmin_BackupRun extends Google_Model { public $description; + protected $diskEncryptionConfigurationType = 'Google_Service_SQLAdmin_DiskEncryptionConfiguration'; + protected $diskEncryptionConfigurationDataType = ''; + protected $diskEncryptionStatusType = 'Google_Service_SQLAdmin_DiskEncryptionStatus'; + protected $diskEncryptionStatusDataType = ''; public $endTime; public $enqueuedTime; protected $errorType = 'Google_Service_SQLAdmin_OperationError'; @@ -40,6 +44,34 @@ class Google_Service_SQLAdmin_BackupRun extends Google_Model { return $this->description; } + /** + * @param Google_Service_SQLAdmin_DiskEncryptionConfiguration + */ + public function setDiskEncryptionConfiguration(Google_Service_SQLAdmin_DiskEncryptionConfiguration $diskEncryptionConfiguration) + { + $this->diskEncryptionConfiguration = $diskEncryptionConfiguration; + } + /** + * @return Google_Service_SQLAdmin_DiskEncryptionConfiguration + */ + public function getDiskEncryptionConfiguration() + { + return $this->diskEncryptionConfiguration; + } + /** + * @param Google_Service_SQLAdmin_DiskEncryptionStatus + */ + public function setDiskEncryptionStatus(Google_Service_SQLAdmin_DiskEncryptionStatus $diskEncryptionStatus) + { + $this->diskEncryptionStatus = $diskEncryptionStatus; + } + /** + * @return Google_Service_SQLAdmin_DiskEncryptionStatus + */ + public function getDiskEncryptionStatus() + { + return $this->diskEncryptionStatus; + } public function setEndTime($endTime) { $this->endTime = $endTime; diff --git a/vendor/google/apiclient-services/src/Google/Service/SQLAdmin/ImportContext.php b/vendor/google/apiclient-services/src/Google/Service/SQLAdmin/ImportContext.php index 9add411..2817561 100644 --- a/vendor/google/apiclient-services/src/Google/Service/SQLAdmin/ImportContext.php +++ b/vendor/google/apiclient-services/src/Google/Service/SQLAdmin/ImportContext.php @@ -17,6 +17,8 @@ class Google_Service_SQLAdmin_ImportContext extends Google_Model { + protected $bakImportOptionsType = 'Google_Service_SQLAdmin_ImportContextBakImportOptions'; + protected $bakImportOptionsDataType = ''; protected $csvImportOptionsType = 'Google_Service_SQLAdmin_ImportContextCsvImportOptions'; protected $csvImportOptionsDataType = ''; public $database; @@ -25,6 +27,20 @@ class Google_Service_SQLAdmin_ImportContext extends Google_Model public $kind; public $uri; + /** + * @param Google_Service_SQLAdmin_ImportContextBakImportOptions + */ + public function setBakImportOptions(Google_Service_SQLAdmin_ImportContextBakImportOptions $bakImportOptions) + { + $this->bakImportOptions = $bakImportOptions; + } + /** + * @return Google_Service_SQLAdmin_ImportContextBakImportOptions + */ + public function getBakImportOptions() + { + return $this->bakImportOptions; + } /** * @param Google_Service_SQLAdmin_ImportContextCsvImportOptions */ diff --git a/vendor/google/apiclient-services/src/Google/Service/SQLAdmin/ImportContextBakImportOptions.php b/vendor/google/apiclient-services/src/Google/Service/SQLAdmin/ImportContextBakImportOptions.php new file mode 100644 index 0000000..56130c2 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/SQLAdmin/ImportContextBakImportOptions.php @@ -0,0 +1,37 @@ +encryptionOptions = $encryptionOptions; + } + /** + * @return Google_Service_SQLAdmin_ImportContextBakImportOptionsEncryptionOptions + */ + public function getEncryptionOptions() + { + return $this->encryptionOptions; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/SQLAdmin/ImportContextBakImportOptionsEncryptionOptions.php b/vendor/google/apiclient-services/src/Google/Service/SQLAdmin/ImportContextBakImportOptionsEncryptionOptions.php new file mode 100644 index 0000000..ecb2cf8 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/SQLAdmin/ImportContextBakImportOptionsEncryptionOptions.php @@ -0,0 +1,48 @@ +certPath = $certPath; + } + public function getCertPath() + { + return $this->certPath; + } + public function setPvkPassword($pvkPassword) + { + $this->pvkPassword = $pvkPassword; + } + public function getPvkPassword() + { + return $this->pvkPassword; + } + public function setPvkPath($pvkPath) + { + $this->pvkPath = $pvkPath; + } + public function getPvkPath() + { + return $this->pvkPath; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/Users.php b/vendor/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/Users.php index e860c38..0b9d919 100644 --- a/vendor/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/Users.php +++ b/vendor/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/Users.php @@ -83,7 +83,8 @@ class Google_Service_SQLAdmin_Resource_Users extends Google_Service_Resource * @param Google_Service_SQLAdmin_User $postBody * @param array $optParams Optional parameters. * - * @opt_param string host Host of the user in the instance. + * @opt_param string host Host of the user in the instance. For a MySQL + * instance, it's required; For a PostgreSQL instance, it's optional. * @return Google_Service_SQLAdmin_Operation */ public function update($project, $instance, $name, Google_Service_SQLAdmin_User $postBody, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Safebrowsing.php b/vendor/google/apiclient-services/src/Google/Service/Safebrowsing.php index a267989..f48e7bc 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Safebrowsing.php +++ b/vendor/google/apiclient-services/src/Google/Service/Safebrowsing.php @@ -20,7 +20,10 @@ * *

* Enables client applications to check web resources (most commonly URLs) - * against Google-generated lists of unsafe web resources.

+ * against Google-generated lists of unsafe web resources. The Safe Browsing + * APIs are for non-commercial use only. If you need to use APIs to detect + * malicious URLs for commercial purposes – meaning “for sale or revenue- + * generating purposes” – please refer to the Web Risk API.

* *

* For more information about this service, see the API @@ -71,11 +74,11 @@ class Google_Service_Safebrowsing extends Google_Service 'type' => 'string', 'required' => true, ), - 'clientId' => array( + 'clientVersion' => array( 'location' => 'query', 'type' => 'string', ), - 'clientVersion' => array( + 'clientId' => array( 'location' => 'query', 'type' => 'string', ), diff --git a/vendor/google/apiclient-services/src/Google/Service/Safebrowsing/Resource/EncodedFullHashes.php b/vendor/google/apiclient-services/src/Google/Service/Safebrowsing/Resource/EncodedFullHashes.php index 74d787c..dd20d3a 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Safebrowsing/Resource/EncodedFullHashes.php +++ b/vendor/google/apiclient-services/src/Google/Service/Safebrowsing/Resource/EncodedFullHashes.php @@ -31,9 +31,9 @@ class Google_Service_Safebrowsing_Resource_EncodedFullHashes extends Google_Serv * @param string $encodedRequest A serialized FindFullHashesRequest proto. * @param array $optParams Optional parameters. * + * @opt_param string clientVersion The version of the client implementation. * @opt_param string clientId A client ID that (hopefully) uniquely identifies * the client implementation of the Safe Browsing API. - * @opt_param string clientVersion The version of the client implementation. * @return Google_Service_Safebrowsing_FindFullHashesResponse */ public function get($encodedRequest, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Script.php b/vendor/google/apiclient-services/src/Google/Service/Script.php index 02e8c44..afa207b 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Script.php +++ b/vendor/google/apiclient-services/src/Google/Service/Script.php @@ -116,10 +116,6 @@ class Google_Service_Script extends Google_Service 'path' => 'v1/processes', 'httpMethod' => 'GET', 'parameters' => array( - 'userProcessFilter.deploymentId' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -163,11 +159,23 @@ class Google_Service_Script extends Google_Service 'type' => 'string', 'repeated' => true, ), + 'userProcessFilter.deploymentId' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'listScriptProcesses' => array( 'path' => 'v1/processes:listScriptProcesses', 'httpMethod' => 'GET', 'parameters' => array( + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'pageSize' => array( + 'location' => 'query', + 'type' => 'integer', + ), 'scriptProcessFilter.endTime' => array( 'location' => 'query', 'type' => 'string', @@ -203,14 +211,6 @@ class Google_Service_Script extends Google_Service 'type' => 'string', 'repeated' => true, ), - 'pageToken' => array( - 'location' => 'query', - 'type' => 'string', - ), - 'pageSize' => array( - 'location' => 'query', - 'type' => 'integer', - ), ), ), ) diff --git a/vendor/google/apiclient-services/src/Google/Service/Script/Resource/Processes.php b/vendor/google/apiclient-services/src/Google/Service/Script/Resource/Processes.php index 2baa37e..b83e25a 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Script/Resource/Processes.php +++ b/vendor/google/apiclient-services/src/Google/Service/Script/Resource/Processes.php @@ -31,9 +31,6 @@ class Google_Service_Script_Resource_Processes extends Google_Service_Resource * * @param array $optParams Optional parameters. * - * @opt_param string userProcessFilter.deploymentId Optional field used to limit - * returned processes to those originating from projects with a specific - * deployment ID. * @opt_param string pageToken The token for continuing a previous list request * on the next page. This should be set to the value of `nextPageToken` from a * previous response. @@ -60,6 +57,9 @@ class Google_Service_Script_Resource_Processes extends Google_Service_Resource * returned processes to those having one of the specified process types. * @opt_param string userProcessFilter.statuses Optional field used to limit * returned processes to those having one of the specified process statuses. + * @opt_param string userProcessFilter.deploymentId Optional field used to limit + * returned processes to those originating from projects with a specific + * deployment ID. * @return Google_Service_Script_ListUserProcessesResponse */ public function listProcesses($optParams = array()) @@ -74,6 +74,11 @@ class Google_Service_Script_Resource_Processes extends Google_Service_Resource * * @param array $optParams Optional parameters. * + * @opt_param string pageToken The token for continuing a previous list request + * on the next page. This should be set to the value of `nextPageToken` from a + * previous response. + * @opt_param int pageSize The maximum number of returned processes per page of + * results. Defaults to 50. * @opt_param string scriptProcessFilter.endTime Optional field used to limit * returned processes to those that completed on or before the given timestamp. * @opt_param string scriptProcessFilter.userAccessLevels Optional field used to @@ -94,11 +99,6 @@ class Google_Service_Script_Resource_Processes extends Google_Service_Resource * listed. * @opt_param string scriptProcessFilter.types Optional field used to limit * returned processes to those having one of the specified process types. - * @opt_param string pageToken The token for continuing a previous list request - * on the next page. This should be set to the value of `nextPageToken` from a - * previous response. - * @opt_param int pageSize The maximum number of returned processes per page of - * results. Defaults to 50. * @return Google_Service_Script_ListScriptProcessesResponse */ public function listScriptProcesses($optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Script/Resource/Scripts.php b/vendor/google/apiclient-services/src/Google/Service/Script/Resource/Scripts.php index d4bf85f..29a5e86 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Script/Resource/Scripts.php +++ b/vendor/google/apiclient-services/src/Google/Service/Script/Resource/Scripts.php @@ -31,7 +31,7 @@ class Google_Service_Script_Resource_Scripts extends Google_Service_Resource * share the same Cloud Platform project. * * This method requires authorization with an OAuth 2.0 token that includes at - * least one of the scopes listed in the [Authorization](#authorization) + * least one of the scopes listed in the [Authorization](#authorization-scopes) * section; script projects that do not require authorization cannot be executed * through this API. To find the correct scopes to include in the authentication * token, open the project in the script editor, then select **File > Project diff --git a/vendor/google/apiclient-services/src/Google/Service/SecurityCommandCenter.php b/vendor/google/apiclient-services/src/Google/Service/SecurityCommandCenter.php index 9a32a5d..f90e8d1 100644 --- a/vendor/google/apiclient-services/src/Google/Service/SecurityCommandCenter.php +++ b/vendor/google/apiclient-services/src/Google/Service/SecurityCommandCenter.php @@ -116,15 +116,23 @@ class Google_Service_SecurityCommandCenter extends Google_Service 'type' => 'string', 'required' => true, ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'fieldMask' => array( + 'location' => 'query', + 'type' => 'string', + ), 'pageSize' => array( 'location' => 'query', 'type' => 'integer', ), - 'orderBy' => array( + 'readTime' => array( 'location' => 'query', 'type' => 'string', ), - 'readTime' => array( + 'orderBy' => array( 'location' => 'query', 'type' => 'string', ), @@ -136,14 +144,6 @@ class Google_Service_SecurityCommandCenter extends Google_Service 'location' => 'query', 'type' => 'string', ), - 'fieldMask' => array( - 'location' => 'query', - 'type' => 'string', - ), - 'pageToken' => array( - 'location' => 'query', - 'type' => 'string', - ), ), ),'runDiscovery' => array( 'path' => 'v1/{+parent}/assets:runDiscovery', @@ -370,26 +370,14 @@ class Google_Service_SecurityCommandCenter extends Google_Service 'type' => 'string', 'required' => true, ), - 'fieldMask' => array( + 'readTime' => array( 'location' => 'query', 'type' => 'string', ), - 'pageToken' => array( - 'location' => 'query', - 'type' => 'string', - ), - 'pageSize' => array( - 'location' => 'query', - 'type' => 'integer', - ), 'orderBy' => array( 'location' => 'query', 'type' => 'string', ), - 'readTime' => array( - 'location' => 'query', - 'type' => 'string', - ), 'compareDuration' => array( 'location' => 'query', 'type' => 'string', @@ -398,6 +386,18 @@ class Google_Service_SecurityCommandCenter extends Google_Service 'location' => 'query', 'type' => 'string', ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'fieldMask' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'pageSize' => array( + 'location' => 'query', + 'type' => 'integer', + ), ), ),'patch' => array( 'path' => 'v1/{+name}', @@ -432,11 +432,11 @@ class Google_Service_SecurityCommandCenter extends Google_Service 'type' => 'string', 'required' => true, ), - 'updateMask' => array( + 'startTime' => array( 'location' => 'query', 'type' => 'string', ), - 'startTime' => array( + 'updateMask' => array( 'location' => 'query', 'type' => 'string', ), diff --git a/vendor/google/apiclient-services/src/Google/Service/SecurityCommandCenter/Resource/Organizations.php b/vendor/google/apiclient-services/src/Google/Service/SecurityCommandCenter/Resource/Organizations.php index 8cf5639..cbc167d 100644 --- a/vendor/google/apiclient-services/src/Google/Service/SecurityCommandCenter/Resource/Organizations.php +++ b/vendor/google/apiclient-services/src/Google/Service/SecurityCommandCenter/Resource/Organizations.php @@ -29,8 +29,9 @@ class Google_Service_SecurityCommandCenter_Resource_Organizations extends Google * Gets the settings for an organization. * (organizations.getOrganizationSettings) * - * @param string $name Name of the organization to get organization settings - * for. Its format is "organizations/[organization_id]/organizationSettings". + * @param string $name Required. Name of the organization to get organization + * settings for. Its format is + * "organizations/[organization_id]/organizationSettings". * @param array $optParams Optional parameters. * @return Google_Service_SecurityCommandCenter_OrganizationSettings */ diff --git a/vendor/google/apiclient-services/src/Google/Service/SecurityCommandCenter/Resource/OrganizationsAssets.php b/vendor/google/apiclient-services/src/Google/Service/SecurityCommandCenter/Resource/OrganizationsAssets.php index 8be637c..e4479f8 100644 --- a/vendor/google/apiclient-services/src/Google/Service/SecurityCommandCenter/Resource/OrganizationsAssets.php +++ b/vendor/google/apiclient-services/src/Google/Service/SecurityCommandCenter/Resource/OrganizationsAssets.php @@ -29,8 +29,8 @@ class Google_Service_SecurityCommandCenter_Resource_OrganizationsAssets extends * Filters an organization's assets and groups them by their specified * properties. (assets.group) * - * @param string $parent Name of the organization to groupBy. Its format is - * "organizations/[organization_id]". + * @param string $parent Required. Name of the organization to groupBy. Its + * format is "organizations/[organization_id]". * @param Google_Service_SecurityCommandCenter_GroupAssetsRequest $postBody * @param array $optParams Optional parameters. * @return Google_Service_SecurityCommandCenter_GroupAssetsResponse @@ -44,12 +44,22 @@ class Google_Service_SecurityCommandCenter_Resource_OrganizationsAssets extends /** * Lists an organization's assets. (assets.listOrganizationsAssets) * - * @param string $parent Name of the organization assets should belong to. Its - * format is "organizations/[organization_id]". + * @param string $parent Required. Name of the organization assets should belong + * to. Its format is "organizations/[organization_id]". * @param array $optParams Optional parameters. * + * @opt_param string pageToken The value returned by the last + * `ListAssetsResponse`; indicates that this is a continuation of a prior + * `ListAssets` call, and that the system should return the next page of data. + * @opt_param string fieldMask Optional. A field mask to specify the + * ListAssetsResult fields to be listed in the response. An empty field mask + * will list all fields. * @opt_param int pageSize The maximum number of results to return in a single * response. Default is 10, minimum is 1, maximum is 1000. + * @opt_param string readTime Time used as a reference point when filtering + * assets. The filter is limited to assets existing at the supplied time and + * their values are those at that specific time. Absence of this field will + * default to the API's version of NOW. * @opt_param string orderBy Expression that defines what fields and order to * use for sorting. The string value should follow SQL syntax: comma separated * list of fields. For example: "name,resource_properties.a_property". The @@ -64,10 +74,6 @@ class Google_Service_SecurityCommandCenter_Resource_OrganizationsAssets extends * security_center_properties.resource_parent * security_center_properties.resource_project * security_center_properties.resource_type - * @opt_param string readTime Time used as a reference point when filtering - * assets. The filter is limited to assets existing at the supplied time and - * their values are those at that specific time. Absence of this field will - * default to the API's version of NOW. * @opt_param string compareDuration When compare_duration is set, the * ListAssetsResult's "state_change" attribute is updated to indicate whether * the asset was added, removed, or remained present during the compare_duration @@ -136,12 +142,6 @@ class Google_Service_SecurityCommandCenter_Resource_OrganizationsAssets extends * security_center_properties.resource_owners: `=`, `:` * * For example, `resource_properties.size = 100` is a valid filter string. - * @opt_param string fieldMask Optional. A field mask to specify the - * ListAssetsResult fields to be listed in the response. An empty field mask - * will list all fields. - * @opt_param string pageToken The value returned by the last - * `ListAssetsResponse`; indicates that this is a continuation of a prior - * `ListAssets` call, and that the system should return the next page of data. * @return Google_Service_SecurityCommandCenter_ListAssetsResponse */ public function listOrganizationsAssets($parent, $optParams = array()) @@ -157,8 +157,8 @@ class Google_Service_SecurityCommandCenter_Resource_OrganizationsAssets extends * is called too frequently the caller will receive a TOO_MANY_REQUESTS error. * (assets.runDiscovery) * - * @param string $parent Name of the organization to run asset discovery for. - * Its format is "organizations/[organization_id]". + * @param string $parent Required. Name of the organization to run asset + * discovery for. Its format is "organizations/[organization_id]". * @param Google_Service_SecurityCommandCenter_RunAssetDiscoveryRequest $postBody * @param array $optParams Optional parameters. * @return Google_Service_SecurityCommandCenter_Operation diff --git a/vendor/google/apiclient-services/src/Google/Service/SecurityCommandCenter/Resource/OrganizationsSources.php b/vendor/google/apiclient-services/src/Google/Service/SecurityCommandCenter/Resource/OrganizationsSources.php index dffab0f..ca3e707 100644 --- a/vendor/google/apiclient-services/src/Google/Service/SecurityCommandCenter/Resource/OrganizationsSources.php +++ b/vendor/google/apiclient-services/src/Google/Service/SecurityCommandCenter/Resource/OrganizationsSources.php @@ -28,8 +28,8 @@ class Google_Service_SecurityCommandCenter_Resource_OrganizationsSources extends /** * Creates a source. (sources.create) * - * @param string $parent Resource name of the new source's parent. Its format - * should be "organizations/[organization_id]". + * @param string $parent Required. Resource name of the new source's parent. Its + * format should be "organizations/[organization_id]". * @param Google_Service_SecurityCommandCenter_Source $postBody * @param array $optParams Optional parameters. * @return Google_Service_SecurityCommandCenter_Source @@ -43,8 +43,8 @@ class Google_Service_SecurityCommandCenter_Resource_OrganizationsSources extends /** * Gets a source. (sources.get) * - * @param string $name Relative resource name of the source. Its format is - * "organizations/[organization_id]/source/[source_id]". + * @param string $name Required. Relative resource name of the source. Its + * format is "organizations/[organization_id]/source/[source_id]". * @param array $optParams Optional parameters. * @return Google_Service_SecurityCommandCenter_Source */ @@ -75,8 +75,8 @@ class Google_Service_SecurityCommandCenter_Resource_OrganizationsSources extends * Lists all sources belonging to an organization. * (sources.listOrganizationsSources) * - * @param string $parent Resource name of the parent of sources to list. Its - * format should be "organizations/[organization_id]". + * @param string $parent Required. Resource name of the parent of sources to + * list. Its format should be "organizations/[organization_id]". * @param array $optParams Optional parameters. * * @opt_param string pageToken The value returned by the last diff --git a/vendor/google/apiclient-services/src/Google/Service/SecurityCommandCenter/Resource/OrganizationsSourcesFindings.php b/vendor/google/apiclient-services/src/Google/Service/SecurityCommandCenter/Resource/OrganizationsSourcesFindings.php index a30c2da..eca508d 100644 --- a/vendor/google/apiclient-services/src/Google/Service/SecurityCommandCenter/Resource/OrganizationsSourcesFindings.php +++ b/vendor/google/apiclient-services/src/Google/Service/SecurityCommandCenter/Resource/OrganizationsSourcesFindings.php @@ -29,14 +29,14 @@ class Google_Service_SecurityCommandCenter_Resource_OrganizationsSourcesFindings * Creates a finding. The corresponding source must exist for finding creation * to succeed. (findings.create) * - * @param string $parent Resource name of the new finding's parent. Its format - * should be "organizations/[organization_id]/sources/[source_id]". + * @param string $parent Required. Resource name of the new finding's parent. + * Its format should be "organizations/[organization_id]/sources/[source_id]". * @param Google_Service_SecurityCommandCenter_Finding $postBody * @param array $optParams Optional parameters. * - * @opt_param string findingId Unique identifier provided by the client within - * the parent scope. It must be alphanumeric and less than or equal to 32 - * characters and greater than 0 characters in length. + * @opt_param string findingId Required. Unique identifier provided by the + * client within the parent scope. It must be alphanumeric and less than or + * equal to 32 characters and greater than 0 characters in length. * @return Google_Service_SecurityCommandCenter_Finding */ public function create($parent, Google_Service_SecurityCommandCenter_Finding $postBody, $optParams = array()) @@ -52,7 +52,7 @@ class Google_Service_SecurityCommandCenter_Resource_OrganizationsSourcesFindings * To group across all sources provide a `-` as the source id. Example: * /v1/organizations/123/sources/-/findings (findings.group) * - * @param string $parent Name of the source to groupBy. Its format is + * @param string $parent Required. Name of the source to groupBy. Its format is * "organizations/[organization_id]/sources/[source_id]". To groupBy across all * sources provide a source_id of `-`. For example: organizations/123/sources/- * @param Google_Service_SecurityCommandCenter_GroupFindingsRequest $postBody @@ -72,19 +72,16 @@ class Google_Service_SecurityCommandCenter_Resource_OrganizationsSourcesFindings * /v1/organizations/123/sources/-/findings * (findings.listOrganizationsSourcesFindings) * - * @param string $parent Name of the source the findings belong to. Its format - * is "organizations/[organization_id]/sources/[source_id]". To list across all - * sources provide a source_id of `-`. For example: organizations/123/sources/- + * @param string $parent Required. Name of the source the findings belong to. + * Its format is "organizations/[organization_id]/sources/[source_id]". To list + * across all sources provide a source_id of `-`. For example: + * organizations/123/sources/- * @param array $optParams Optional parameters. * - * @opt_param string fieldMask Optional. A field mask to specify the Finding - * fields to be listed in the response. An empty field mask will list all - * fields. - * @opt_param string pageToken The value returned by the last - * `ListFindingsResponse`; indicates that this is a continuation of a prior - * `ListFindings` call, and that the system should return the next page of data. - * @opt_param int pageSize The maximum number of results to return in a single - * response. Default is 10, minimum is 1, maximum is 1000. + * @opt_param string readTime Time used as a reference point when filtering + * findings. The filter is limited to findings existing at the supplied time and + * their values are those at that specific time. Absence of this field will + * default to the API's version of NOW. * @opt_param string orderBy Expression that defines what fields and order to * use for sorting. The string value should follow SQL syntax: comma separated * list of fields. For example: "name,resource_properties.a_property". The @@ -96,10 +93,6 @@ class Google_Service_SecurityCommandCenter_Resource_OrganizationsSourcesFindings * * The following fields are supported: name parent state category resource_name * event_time source_properties security_marks.marks - * @opt_param string readTime Time used as a reference point when filtering - * findings. The filter is limited to findings existing at the supplied time and - * their values are those at that specific time. Absence of this field will - * default to the API's version of NOW. * @opt_param string compareDuration When compare_duration is set, the * ListFindingsResult's "state_change" attribute is updated to indicate whether * the finding had its state changed, the finding's state remained unchanged, or @@ -157,6 +150,14 @@ class Google_Service_SecurityCommandCenter_Resource_OrganizationsSourcesFindings * `<=` * * For example, `source_properties.size = 100` is a valid filter string. + * @opt_param string pageToken The value returned by the last + * `ListFindingsResponse`; indicates that this is a continuation of a prior + * `ListFindings` call, and that the system should return the next page of data. + * @opt_param string fieldMask Optional. A field mask to specify the Finding + * fields to be listed in the response. An empty field mask will list all + * fields. + * @opt_param int pageSize The maximum number of results to return in a single + * response. Default is 10, minimum is 1, maximum is 1000. * @return Google_Service_SecurityCommandCenter_ListFindingsResponse */ public function listOrganizationsSourcesFindings($parent, $optParams = array()) @@ -192,7 +193,7 @@ class Google_Service_SecurityCommandCenter_Resource_OrganizationsSourcesFindings /** * Updates the state of a finding. (findings.setState) * - * @param string $name The relative resource name of the finding. See: + * @param string $name Required. The relative resource name of the finding. See: * https://cloud.google.com/apis/design/resource_names#relative_resource_name * Example: "organizations/123/sources/456/finding/789". * @param Google_Service_SecurityCommandCenter_SetFindingStateRequest $postBody @@ -215,14 +216,14 @@ class Google_Service_SecurityCommandCenter_Resource_OrganizationsSourcesFindings * @param Google_Service_SecurityCommandCenter_SecurityMarks $postBody * @param array $optParams Optional parameters. * + * @opt_param string startTime The time at which the updated SecurityMarks take + * effect. If not set uses current server time. Updates will be applied to the + * SecurityMarks that are active immediately preceding this time. * @opt_param string updateMask The FieldMask to use when updating the security * marks resource. * * The field mask must not contain duplicate fields. If empty or set to "marks", * all marks will be replaced. Individual marks can be updated using "marks.". - * @opt_param string startTime The time at which the updated SecurityMarks take - * effect. If not set uses current server time. Updates will be applied to the - * SecurityMarks that are active immediately preceding this time. * @return Google_Service_SecurityCommandCenter_SecurityMarks */ public function updateSecurityMarks($name, Google_Service_SecurityCommandCenter_SecurityMarks $postBody, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/ServiceBroker/Resource/V1.php b/vendor/google/apiclient-services/src/Google/Service/ServiceBroker/Resource/V1.php index 8e9e6cd..364277e 100644 --- a/vendor/google/apiclient-services/src/Google/Service/ServiceBroker/Resource/V1.php +++ b/vendor/google/apiclient-services/src/Google/Service/ServiceBroker/Resource/V1.php @@ -35,8 +35,14 @@ class Google_Service_ServiceBroker_Resource_V1 extends Google_Service_Resource * @param array $optParams Optional parameters. * * @opt_param int options.requestedPolicyVersion Optional. The policy format - * version to be returned. Acceptable values are 0, 1, and 3. If the value is 0, - * or the field is omitted, policy format version 1 will be returned. + * version to be returned. + * + * Valid values are 0, 1, and 3. Requests specifying an invalid value will be + * rejected. + * + * Requests for policies with any conditional bindings must specify version 3. + * Policies without any conditional bindings may specify any valid value or + * leave the field unset. * @return Google_Service_ServiceBroker_GoogleIamV1Policy */ public function getIamPolicy($resource, $optParams = array()) @@ -47,7 +53,10 @@ class Google_Service_ServiceBroker_Resource_V1 extends Google_Service_Resource } /** * Sets the access control policy on the specified resource. Replaces any - * existing policy. (v1.setIamPolicy) + * existing policy. + * + * Can return Public Errors: NOT_FOUND, INVALID_ARGUMENT and PERMISSION_DENIED + * (v1.setIamPolicy) * * @param string $resource REQUIRED: The resource for which the policy is being * specified. See the operation documentation for the appropriate value for this diff --git a/vendor/google/apiclient-services/src/Google/Service/ServiceConsumerManagement.php b/vendor/google/apiclient-services/src/Google/Service/ServiceConsumerManagement.php index 885b9a1..3bb1c5b 100644 --- a/vendor/google/apiclient-services/src/Google/Service/ServiceConsumerManagement.php +++ b/vendor/google/apiclient-services/src/Google/Service/ServiceConsumerManagement.php @@ -131,6 +131,10 @@ class Google_Service_ServiceConsumerManagement extends Google_Service 'type' => 'string', 'required' => true, ), + 'pageSize' => array( + 'location' => 'query', + 'type' => 'integer', + ), 'query' => array( 'location' => 'query', 'type' => 'string', @@ -139,10 +143,6 @@ class Google_Service_ServiceConsumerManagement extends Google_Service 'location' => 'query', 'type' => 'string', ), - 'pageSize' => array( - 'location' => 'query', - 'type' => 'integer', - ), ), ), ) diff --git a/vendor/google/apiclient-services/src/Google/Service/ServiceConsumerManagement/MetricDescriptor.php b/vendor/google/apiclient-services/src/Google/Service/ServiceConsumerManagement/MetricDescriptor.php index 31852f5..084ffa0 100644 --- a/vendor/google/apiclient-services/src/Google/Service/ServiceConsumerManagement/MetricDescriptor.php +++ b/vendor/google/apiclient-services/src/Google/Service/ServiceConsumerManagement/MetricDescriptor.php @@ -17,7 +17,7 @@ class Google_Service_ServiceConsumerManagement_MetricDescriptor extends Google_Collection { - protected $collection_key = 'labels'; + protected $collection_key = 'monitoredResourceTypes'; public $description; public $displayName; protected $labelsType = 'Google_Service_ServiceConsumerManagement_LabelDescriptor'; @@ -26,6 +26,7 @@ class Google_Service_ServiceConsumerManagement_MetricDescriptor extends Google_C protected $metadataType = 'Google_Service_ServiceConsumerManagement_MetricDescriptorMetadata'; protected $metadataDataType = ''; public $metricKind; + public $monitoredResourceTypes; public $name; public $type; public $unit; @@ -91,6 +92,14 @@ class Google_Service_ServiceConsumerManagement_MetricDescriptor extends Google_C { return $this->metricKind; } + public function setMonitoredResourceTypes($monitoredResourceTypes) + { + $this->monitoredResourceTypes = $monitoredResourceTypes; + } + public function getMonitoredResourceTypes() + { + return $this->monitoredResourceTypes; + } public function setName($name) { $this->name = $name; diff --git a/vendor/google/apiclient-services/src/Google/Service/ServiceConsumerManagement/Resource/Services.php b/vendor/google/apiclient-services/src/Google/Service/ServiceConsumerManagement/Resource/Services.php index 8a921d7..bca653e 100644 --- a/vendor/google/apiclient-services/src/Google/Service/ServiceConsumerManagement/Resource/Services.php +++ b/vendor/google/apiclient-services/src/Google/Service/ServiceConsumerManagement/Resource/Services.php @@ -33,6 +33,12 @@ class Google_Service_ServiceConsumerManagement_Resource_Services extends Google_ * 'service.googleapis.com'. * @param array $optParams Optional parameters. * + * @opt_param int pageSize The maximum number of results returned by this + * request. Currently, the default maximum is set to 1000. If `page_size` isn't + * provided or the size provided is a number larger than 1000, it's + * automatically set to 1000. + * + * Optional. * @opt_param string query Set a query `{expression}` for querying tenancy * units. Your `{expression}` must be in the format: * `field_name=literal_string`. The `field_name` is the name of the field you @@ -55,12 +61,6 @@ class Google_Service_ServiceConsumerManagement_Resource_Services extends Google_ * parameter to the value of `nextPageToken` from the previous response. * * Optional. - * @opt_param int pageSize The maximum number of results returned by this - * request. Currently, the default maximum is set to 1000. If `page_size` isn't - * provided or the size provided is a number larger than 1000, it's - * automatically set to 1000. - * - * Optional. * @return Google_Service_ServiceConsumerManagement_SearchTenancyUnitsResponse */ public function search($parent, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/ServiceConsumerManagement/V1Beta1GenerateServiceIdentityResponse.php b/vendor/google/apiclient-services/src/Google/Service/ServiceConsumerManagement/V1Beta1GenerateServiceIdentityResponse.php new file mode 100644 index 0000000..be25ddc --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/ServiceConsumerManagement/V1Beta1GenerateServiceIdentityResponse.php @@ -0,0 +1,37 @@ +identity = $identity; + } + /** + * @return Google_Service_ServiceConsumerManagement_V1Beta1ServiceIdentity + */ + public function getIdentity() + { + return $this->identity; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/ServiceConsumerManagement/V1Beta1ServiceIdentity.php b/vendor/google/apiclient-services/src/Google/Service/ServiceConsumerManagement/V1Beta1ServiceIdentity.php new file mode 100644 index 0000000..28aec0f --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/ServiceConsumerManagement/V1Beta1ServiceIdentity.php @@ -0,0 +1,57 @@ +email = $email; + } + public function getEmail() + { + return $this->email; + } + public function setName($name) + { + $this->name = $name; + } + public function getName() + { + return $this->name; + } + public function setTag($tag) + { + $this->tag = $tag; + } + public function getTag() + { + return $this->tag; + } + public function setUniqueId($uniqueId) + { + $this->uniqueId = $uniqueId; + } + public function getUniqueId() + { + return $this->uniqueId; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/ServiceManagement.php b/vendor/google/apiclient-services/src/Google/Service/ServiceManagement.php index 3101daf..8b07331 100644 --- a/vendor/google/apiclient-services/src/Google/Service/ServiceManagement.php +++ b/vendor/google/apiclient-services/src/Google/Service/ServiceManagement.php @@ -170,11 +170,11 @@ class Google_Service_ServiceManagement extends Google_Service 'type' => 'string', 'required' => true, ), - 'configId' => array( + 'view' => array( 'location' => 'query', 'type' => 'string', ), - 'view' => array( + 'configId' => array( 'location' => 'query', 'type' => 'string', ), @@ -193,14 +193,6 @@ class Google_Service_ServiceManagement extends Google_Service 'path' => 'v1/services', 'httpMethod' => 'GET', 'parameters' => array( - 'consumerId' => array( - 'location' => 'query', - 'type' => 'string', - ), - 'pageToken' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageSize' => array( 'location' => 'query', 'type' => 'integer', @@ -209,6 +201,14 @@ class Google_Service_ServiceManagement extends Google_Service 'location' => 'query', 'type' => 'string', ), + 'consumerId' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'setIamPolicy' => array( 'path' => 'v1/{+resource}:setIamPolicy', diff --git a/vendor/google/apiclient-services/src/Google/Service/ServiceManagement/DisableServiceResponse.php b/vendor/google/apiclient-services/src/Google/Service/ServiceManagement/DisableServiceResponse.php new file mode 100644 index 0000000..f2bb115 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/ServiceManagement/DisableServiceResponse.php @@ -0,0 +1,20 @@ +metricKind; } + public function setMonitoredResourceTypes($monitoredResourceTypes) + { + $this->monitoredResourceTypes = $monitoredResourceTypes; + } + public function getMonitoredResourceTypes() + { + return $this->monitoredResourceTypes; + } public function setName($name) { $this->name = $name; diff --git a/vendor/google/apiclient-services/src/Google/Service/ServiceManagement/Resource/Services.php b/vendor/google/apiclient-services/src/Google/Service/ServiceManagement/Resource/Services.php index 7d65faf..2ac2431 100644 --- a/vendor/google/apiclient-services/src/Google/Service/ServiceManagement/Resource/Services.php +++ b/vendor/google/apiclient-services/src/Google/Service/ServiceManagement/Resource/Services.php @@ -49,9 +49,9 @@ class Google_Service_ServiceManagement_Resource_Services extends Google_Service_ * * Operation (services.delete) * - * @param string $serviceName The name of the service. See the [overview - * ](/service-management/overview) for naming requirements. For example: - * `example.googleapis.com`. + * @param string $serviceName Required. The name of the service. See the + * [overview](/service-management/overview) for naming requirements. For + * example: `example.googleapis.com`. * @param array $optParams Optional parameters. * @return Google_Service_ServiceManagement_Operation */ @@ -68,8 +68,8 @@ class Google_Service_ServiceManagement_Resource_Services extends Google_Service_ * * Operation (services.disable) * - * @param string $serviceName Name of the service to disable. Specifying an - * unknown service name will cause the request to fail. + * @param string $serviceName Required. Name of the service to disable. + * Specifying an unknown service name will cause the request to fail. * @param Google_Service_ServiceManagement_DisableServiceRequest $postBody * @param array $optParams Optional parameters. * @return Google_Service_ServiceManagement_Operation @@ -87,8 +87,8 @@ class Google_Service_ServiceManagement_Resource_Services extends Google_Service_ * * Operation (services.enable) * - * @param string $serviceName Name of the service to enable. Specifying an - * unknown service name will cause the request to fail. + * @param string $serviceName Required. Name of the service to enable. + * Specifying an unknown service name will cause the request to fail. * @param Google_Service_ServiceManagement_EnableServiceRequest $postBody * @param array $optParams Optional parameters. * @return Google_Service_ServiceManagement_Operation @@ -125,8 +125,9 @@ class Google_Service_ServiceManagement_Resource_Services extends Google_Service_ * Gets a managed service. Authentication is required unless the service is * public. (services.get) * - * @param string $serviceName The name of the service. See the `ServiceManager` - * overview for naming requirements. For example: `example.googleapis.com`. + * @param string $serviceName Required. The name of the service. See the + * `ServiceManager` overview for naming requirements. For example: + * `example.googleapis.com`. * @param array $optParams Optional parameters. * @return Google_Service_ServiceManagement_ManagedService */ @@ -140,17 +141,18 @@ class Google_Service_ServiceManagement_Resource_Services extends Google_Service_ * Gets a service configuration (version) for a managed service. * (services.getConfig) * - * @param string $serviceName The name of the service. See the [overview - * ](/service-management/overview) for naming requirements. For example: - * `example.googleapis.com`. + * @param string $serviceName Required. The name of the service. See the + * [overview](/service-management/overview) for naming requirements. For + * example: `example.googleapis.com`. * @param array $optParams Optional parameters. * - * @opt_param string configId The id of the service configuration resource. + * @opt_param string view Specifies which parts of the Service Config should be + * returned in the response. + * @opt_param string configId Required. The id of the service configuration + * resource. * * This field must be specified for the server to return all fields, including * `SourceInfo`. - * @opt_param string view Specifies which parts of the Service Config should be - * returned in the response. * @return Google_Service_ServiceManagement_Service */ public function getConfig($serviceName, $optParams = array()) @@ -189,6 +191,10 @@ class Google_Service_ServiceManagement_Resource_Services extends Google_Service_ * * @param array $optParams Optional parameters. * + * @opt_param int pageSize The max number of items to include in the response + * list. Page size is 50 if not specified. Maximum value is 100. + * @opt_param string producerProjectId Include services produced by the + * specified project. * @opt_param string consumerId Include services consumed by the specified * consumer. * @@ -196,10 +202,6 @@ class Google_Service_ServiceManagement_Resource_Services extends Google_Service_ * project: * @opt_param string pageToken Token identifying which result to start with; * returned by a previous list call. - * @opt_param int pageSize The max number of items to include in the response - * list. Page size is 50 if not specified. Maximum value is 100. - * @opt_param string producerProjectId Include services produced by the - * specified project. * @return Google_Service_ServiceManagement_ListServicesResponse */ public function listServices($optParams = array()) @@ -210,7 +212,10 @@ class Google_Service_ServiceManagement_Resource_Services extends Google_Service_ } /** * Sets the access control policy on the specified resource. Replaces any - * existing policy. (services.setIamPolicy) + * existing policy. + * + * Can return Public Errors: NOT_FOUND, INVALID_ARGUMENT and PERMISSION_DENIED + * (services.setIamPolicy) * * @param string $resource REQUIRED: The resource for which the policy is being * specified. See the operation documentation for the appropriate value for this @@ -254,9 +259,9 @@ class Google_Service_ServiceManagement_Resource_Services extends Google_Service_ * * Operation (services.undelete) * - * @param string $serviceName The name of the service. See the [overview - * ](/service-management/overview) for naming requirements. For example: - * `example.googleapis.com`. + * @param string $serviceName Required. The name of the service. See the + * [overview](/service-management/overview) for naming requirements. For + * example: `example.googleapis.com`. * @param array $optParams Optional parameters. * @return Google_Service_ServiceManagement_Operation */ diff --git a/vendor/google/apiclient-services/src/Google/Service/ServiceManagement/Resource/ServicesConfigs.php b/vendor/google/apiclient-services/src/Google/Service/ServiceManagement/Resource/ServicesConfigs.php index faf5b78..53bb7ce 100644 --- a/vendor/google/apiclient-services/src/Google/Service/ServiceManagement/Resource/ServicesConfigs.php +++ b/vendor/google/apiclient-services/src/Google/Service/ServiceManagement/Resource/ServicesConfigs.php @@ -34,9 +34,9 @@ class Google_Service_ServiceManagement_Resource_ServicesConfigs extends Google_S * existing rollouts are kept for each service. The rest will be deleted * eventually. (configs.create) * - * @param string $serviceName The name of the service. See the [overview - * ](/service-management/overview) for naming requirements. For example: - * `example.googleapis.com`. + * @param string $serviceName Required. The name of the service. See the + * [overview](/service-management/overview) for naming requirements. For + * example: `example.googleapis.com`. * @param Google_Service_ServiceManagement_Service $postBody * @param array $optParams Optional parameters. * @return Google_Service_ServiceManagement_Service @@ -50,10 +50,11 @@ class Google_Service_ServiceManagement_Resource_ServicesConfigs extends Google_S /** * Gets a service configuration (version) for a managed service. (configs.get) * - * @param string $serviceName The name of the service. See the [overview - * ](/service-management/overview) for naming requirements. For example: - * `example.googleapis.com`. - * @param string $configId The id of the service configuration resource. + * @param string $serviceName Required. The name of the service. See the + * [overview](/service-management/overview) for naming requirements. For + * example: `example.googleapis.com`. + * @param string $configId Required. The id of the service configuration + * resource. * * This field must be specified for the server to return all fields, including * `SourceInfo`. @@ -73,9 +74,9 @@ class Google_Service_ServiceManagement_Resource_ServicesConfigs extends Google_S * Lists the history of the service configuration for a managed service, from * the newest to the oldest. (configs.listServicesConfigs) * - * @param string $serviceName The name of the service. See the [overview - * ](/service-management/overview) for naming requirements. For example: - * `example.googleapis.com`. + * @param string $serviceName Required. The name of the service. See the + * [overview](/service-management/overview) for naming requirements. For + * example: `example.googleapis.com`. * @param array $optParams Optional parameters. * * @opt_param string pageToken The token of the page to retrieve. @@ -102,9 +103,9 @@ class Google_Service_ServiceManagement_Resource_ServicesConfigs extends Google_S * * Operation (configs.submit) * - * @param string $serviceName The name of the service. See the [overview - * ](/service-management/overview) for naming requirements. For example: - * `example.googleapis.com`. + * @param string $serviceName Required. The name of the service. See the + * [overview](/service-management/overview) for naming requirements. For + * example: `example.googleapis.com`. * @param Google_Service_ServiceManagement_SubmitConfigSourceRequest $postBody * @param array $optParams Optional parameters. * @return Google_Service_ServiceManagement_Operation diff --git a/vendor/google/apiclient-services/src/Google/Service/ServiceManagement/Resource/ServicesConsumers.php b/vendor/google/apiclient-services/src/Google/Service/ServiceManagement/Resource/ServicesConsumers.php index e21e5f8..7e782db 100644 --- a/vendor/google/apiclient-services/src/Google/Service/ServiceManagement/Resource/ServicesConsumers.php +++ b/vendor/google/apiclient-services/src/Google/Service/ServiceManagement/Resource/ServicesConsumers.php @@ -44,7 +44,10 @@ class Google_Service_ServiceManagement_Resource_ServicesConsumers extends Google } /** * Sets the access control policy on the specified resource. Replaces any - * existing policy. (consumers.setIamPolicy) + * existing policy. + * + * Can return Public Errors: NOT_FOUND, INVALID_ARGUMENT and PERMISSION_DENIED + * (consumers.setIamPolicy) * * @param string $resource REQUIRED: The resource for which the policy is being * specified. See the operation documentation for the appropriate value for this diff --git a/vendor/google/apiclient-services/src/Google/Service/ServiceManagement/Resource/ServicesRollouts.php b/vendor/google/apiclient-services/src/Google/Service/ServiceManagement/Resource/ServicesRollouts.php index d03a362..bba2dca 100644 --- a/vendor/google/apiclient-services/src/Google/Service/ServiceManagement/Resource/ServicesRollouts.php +++ b/vendor/google/apiclient-services/src/Google/Service/ServiceManagement/Resource/ServicesRollouts.php @@ -41,9 +41,9 @@ class Google_Service_ServiceManagement_Resource_ServicesRollouts extends Google_ * * Operation (rollouts.create) * - * @param string $serviceName The name of the service. See the [overview - * ](/service-management/overview) for naming requirements. For example: - * `example.googleapis.com`. + * @param string $serviceName Required. The name of the service. See the + * [overview](/service-management/overview) for naming requirements. For + * example: `example.googleapis.com`. * @param Google_Service_ServiceManagement_Rollout $postBody * @param array $optParams Optional parameters. * @@ -67,10 +67,10 @@ class Google_Service_ServiceManagement_Resource_ServicesRollouts extends Google_ /** * Gets a service configuration rollout. (rollouts.get) * - * @param string $serviceName The name of the service. See the [overview - * ](/service-management/overview) for naming requirements. For example: - * `example.googleapis.com`. - * @param string $rolloutId The id of the rollout resource. + * @param string $serviceName Required. The name of the service. See the + * [overview](/service-management/overview) for naming requirements. For + * example: `example.googleapis.com`. + * @param string $rolloutId Required. The id of the rollout resource. * @param array $optParams Optional parameters. * @return Google_Service_ServiceManagement_Rollout */ @@ -84,18 +84,18 @@ class Google_Service_ServiceManagement_Resource_ServicesRollouts extends Google_ * Lists the history of the service configuration rollouts for a managed * service, from the newest to the oldest. (rollouts.listServicesRollouts) * - * @param string $serviceName The name of the service. See the [overview - * ](/service-management/overview) for naming requirements. For example: - * `example.googleapis.com`. + * @param string $serviceName Required. The name of the service. See the + * [overview](/service-management/overview) for naming requirements. For + * example: `example.googleapis.com`. * @param array $optParams Optional parameters. * * @opt_param string pageToken The token of the page to retrieve. * @opt_param int pageSize The max number of items to include in the response * list. Page size is 50 if not specified. Maximum value is 100. - * @opt_param string filter Use `filter` to return subset of rollouts. The - * following filters are supported: -- To limit the results to only those in - * [status](google.api.servicemanagement.v1.RolloutStatus) 'SUCCESS', use - * filter='status=SUCCESS' -- To limit the results to those in + * @opt_param string filter Required. Use `filter` to return subset of rollouts. + * The following filters are supported: -- To limit the results to only those + * in [status](google.api.servicemanagement.v1.RolloutStatus) 'SUCCESS', + * use filter='status=SUCCESS' -- To limit the results to those in * [status](google.api.servicemanagement.v1.RolloutStatus) 'CANCELLED' or * 'FAILED', use filter='status=CANCELLED OR status=FAILED' * @return Google_Service_ServiceManagement_ListServiceRolloutsResponse diff --git a/vendor/google/apiclient-services/src/Google/Service/ServiceNetworking.php b/vendor/google/apiclient-services/src/Google/Service/ServiceNetworking.php index d115b9f..fea8e58 100644 --- a/vendor/google/apiclient-services/src/Google/Service/ServiceNetworking.php +++ b/vendor/google/apiclient-services/src/Google/Service/ServiceNetworking.php @@ -102,6 +102,10 @@ class Google_Service_ServiceNetworking extends Google_Service 'type' => 'string', 'required' => true, ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -110,10 +114,6 @@ class Google_Service_ServiceNetworking extends Google_Service 'location' => 'query', 'type' => 'integer', ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), ), ), ) diff --git a/vendor/google/apiclient-services/src/Google/Service/ServiceNetworking/MetricDescriptor.php b/vendor/google/apiclient-services/src/Google/Service/ServiceNetworking/MetricDescriptor.php index bb5a3ca..1b1ebae 100644 --- a/vendor/google/apiclient-services/src/Google/Service/ServiceNetworking/MetricDescriptor.php +++ b/vendor/google/apiclient-services/src/Google/Service/ServiceNetworking/MetricDescriptor.php @@ -17,7 +17,7 @@ class Google_Service_ServiceNetworking_MetricDescriptor extends Google_Collection { - protected $collection_key = 'labels'; + protected $collection_key = 'monitoredResourceTypes'; public $description; public $displayName; protected $labelsType = 'Google_Service_ServiceNetworking_LabelDescriptor'; @@ -26,6 +26,7 @@ class Google_Service_ServiceNetworking_MetricDescriptor extends Google_Collectio protected $metadataType = 'Google_Service_ServiceNetworking_MetricDescriptorMetadata'; protected $metadataDataType = ''; public $metricKind; + public $monitoredResourceTypes; public $name; public $type; public $unit; @@ -91,6 +92,14 @@ class Google_Service_ServiceNetworking_MetricDescriptor extends Google_Collectio { return $this->metricKind; } + public function setMonitoredResourceTypes($monitoredResourceTypes) + { + $this->monitoredResourceTypes = $monitoredResourceTypes; + } + public function getMonitoredResourceTypes() + { + return $this->monitoredResourceTypes; + } public function setName($name) { $this->name = $name; diff --git a/vendor/google/apiclient-services/src/Google/Service/ServiceNetworking/Resource/Operations.php b/vendor/google/apiclient-services/src/Google/Service/ServiceNetworking/Resource/Operations.php index e63123b..081dc24 100644 --- a/vendor/google/apiclient-services/src/Google/Service/ServiceNetworking/Resource/Operations.php +++ b/vendor/google/apiclient-services/src/Google/Service/ServiceNetworking/Resource/Operations.php @@ -93,9 +93,9 @@ class Google_Service_ServiceNetworking_Resource_Operations extends Google_Servic * @param string $name The name of the operation's parent resource. * @param array $optParams Optional parameters. * + * @opt_param string filter The standard list filter. * @opt_param string pageToken The standard list page token. * @opt_param int pageSize The standard list page size. - * @opt_param string filter The standard list filter. * @return Google_Service_ServiceNetworking_ListOperationsResponse */ public function listOperations($name, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/ServiceUsage/GetServiceIdentityResponse.php b/vendor/google/apiclient-services/src/Google/Service/ServiceUsage/GetServiceIdentityResponse.php new file mode 100644 index 0000000..82edb8f --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/ServiceUsage/GetServiceIdentityResponse.php @@ -0,0 +1,46 @@ +identity = $identity; + } + /** + * @return Google_Service_ServiceUsage_ServiceIdentity + */ + public function getIdentity() + { + return $this->identity; + } + public function setState($state) + { + $this->state = $state; + } + public function getState() + { + return $this->state; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/ServiceUsage/GoogleApiServiceusageV1beta1GetServiceIdentityResponse.php b/vendor/google/apiclient-services/src/Google/Service/ServiceUsage/GoogleApiServiceusageV1beta1GetServiceIdentityResponse.php new file mode 100644 index 0000000..8670254 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/ServiceUsage/GoogleApiServiceusageV1beta1GetServiceIdentityResponse.php @@ -0,0 +1,46 @@ +identity = $identity; + } + /** + * @return Google_Service_ServiceUsage_GoogleApiServiceusageV1beta1ServiceIdentity + */ + public function getIdentity() + { + return $this->identity; + } + public function setState($state) + { + $this->state = $state; + } + public function getState() + { + return $this->state; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/ServiceUsage/GoogleApiServiceusageV1beta1ServiceIdentity.php b/vendor/google/apiclient-services/src/Google/Service/ServiceUsage/GoogleApiServiceusageV1beta1ServiceIdentity.php new file mode 100644 index 0000000..abc25eb --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/ServiceUsage/GoogleApiServiceusageV1beta1ServiceIdentity.php @@ -0,0 +1,39 @@ +email = $email; + } + public function getEmail() + { + return $this->email; + } + public function setUniqueId($uniqueId) + { + $this->uniqueId = $uniqueId; + } + public function getUniqueId() + { + return $this->uniqueId; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/ServiceUsage/MetricDescriptor.php b/vendor/google/apiclient-services/src/Google/Service/ServiceUsage/MetricDescriptor.php index 8cfc3d8..1487bd5 100644 --- a/vendor/google/apiclient-services/src/Google/Service/ServiceUsage/MetricDescriptor.php +++ b/vendor/google/apiclient-services/src/Google/Service/ServiceUsage/MetricDescriptor.php @@ -17,7 +17,7 @@ class Google_Service_ServiceUsage_MetricDescriptor extends Google_Collection { - protected $collection_key = 'labels'; + protected $collection_key = 'monitoredResourceTypes'; public $description; public $displayName; protected $labelsType = 'Google_Service_ServiceUsage_LabelDescriptor'; @@ -26,6 +26,7 @@ class Google_Service_ServiceUsage_MetricDescriptor extends Google_Collection protected $metadataType = 'Google_Service_ServiceUsage_MetricDescriptorMetadata'; protected $metadataDataType = ''; public $metricKind; + public $monitoredResourceTypes; public $name; public $type; public $unit; @@ -91,6 +92,14 @@ class Google_Service_ServiceUsage_MetricDescriptor extends Google_Collection { return $this->metricKind; } + public function setMonitoredResourceTypes($monitoredResourceTypes) + { + $this->monitoredResourceTypes = $monitoredResourceTypes; + } + public function getMonitoredResourceTypes() + { + return $this->monitoredResourceTypes; + } public function setName($name) { $this->name = $name; diff --git a/vendor/google/apiclient-services/src/Google/Service/ServiceUsage/ServiceIdentity.php b/vendor/google/apiclient-services/src/Google/Service/ServiceUsage/ServiceIdentity.php new file mode 100644 index 0000000..0d61252 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/ServiceUsage/ServiceIdentity.php @@ -0,0 +1,39 @@ +email = $email; + } + public function getEmail() + { + return $this->email; + } + public function setUniqueId($uniqueId) + { + $this->uniqueId = $uniqueId; + } + public function getUniqueId() + { + return $this->uniqueId; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Sheets.php b/vendor/google/apiclient-services/src/Google/Service/Sheets.php index b022633..e0ac1e7 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Sheets.php +++ b/vendor/google/apiclient-services/src/Google/Service/Sheets.php @@ -199,6 +199,14 @@ class Google_Service_Sheets extends Google_Service 'type' => 'string', 'required' => true, ), + 'responseDateTimeRenderOption' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'includeValuesInResponse' => array( + 'location' => 'query', + 'type' => 'boolean', + ), 'responseValueRenderOption' => array( 'location' => 'query', 'type' => 'string', @@ -211,14 +219,6 @@ class Google_Service_Sheets extends Google_Service 'location' => 'query', 'type' => 'string', ), - 'responseDateTimeRenderOption' => array( - 'location' => 'query', - 'type' => 'string', - ), - 'includeValuesInResponse' => array( - 'location' => 'query', - 'type' => 'boolean', - ), ), ),'batchClear' => array( 'path' => 'v4/spreadsheets/{spreadsheetId}/values:batchClear', @@ -249,14 +249,6 @@ class Google_Service_Sheets extends Google_Service 'type' => 'string', 'required' => true, ), - 'valueRenderOption' => array( - 'location' => 'query', - 'type' => 'string', - ), - 'dateTimeRenderOption' => array( - 'location' => 'query', - 'type' => 'string', - ), 'ranges' => array( 'location' => 'query', 'type' => 'string', @@ -266,6 +258,14 @@ class Google_Service_Sheets extends Google_Service 'location' => 'query', 'type' => 'string', ), + 'valueRenderOption' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'dateTimeRenderOption' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'batchGetByDataFilter' => array( 'path' => 'v4/spreadsheets/{spreadsheetId}/values:batchGetByDataFilter', @@ -326,10 +326,6 @@ class Google_Service_Sheets extends Google_Service 'type' => 'string', 'required' => true, ), - 'majorDimension' => array( - 'location' => 'query', - 'type' => 'string', - ), 'valueRenderOption' => array( 'location' => 'query', 'type' => 'string', @@ -338,6 +334,10 @@ class Google_Service_Sheets extends Google_Service 'location' => 'query', 'type' => 'string', ), + 'majorDimension' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'update' => array( 'path' => 'v4/spreadsheets/{spreadsheetId}/values/{range}', @@ -353,10 +353,6 @@ class Google_Service_Sheets extends Google_Service 'type' => 'string', 'required' => true, ), - 'includeValuesInResponse' => array( - 'location' => 'query', - 'type' => 'boolean', - ), 'responseValueRenderOption' => array( 'location' => 'query', 'type' => 'string', @@ -369,6 +365,10 @@ class Google_Service_Sheets extends Google_Service 'location' => 'query', 'type' => 'string', ), + 'includeValuesInResponse' => array( + 'location' => 'query', + 'type' => 'boolean', + ), ), ), ) diff --git a/vendor/google/apiclient-services/src/Google/Service/Sheets/BaselineValueFormat.php b/vendor/google/apiclient-services/src/Google/Service/Sheets/BaselineValueFormat.php new file mode 100644 index 0000000..fabf48e --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Sheets/BaselineValueFormat.php @@ -0,0 +1,103 @@ +comparisonType = $comparisonType; + } + public function getComparisonType() + { + return $this->comparisonType; + } + public function setDescription($description) + { + $this->description = $description; + } + public function getDescription() + { + return $this->description; + } + /** + * @param Google_Service_Sheets_Color + */ + public function setNegativeColor(Google_Service_Sheets_Color $negativeColor) + { + $this->negativeColor = $negativeColor; + } + /** + * @return Google_Service_Sheets_Color + */ + public function getNegativeColor() + { + return $this->negativeColor; + } + /** + * @param Google_Service_Sheets_TextPosition + */ + public function setPosition(Google_Service_Sheets_TextPosition $position) + { + $this->position = $position; + } + /** + * @return Google_Service_Sheets_TextPosition + */ + public function getPosition() + { + return $this->position; + } + /** + * @param Google_Service_Sheets_Color + */ + public function setPositiveColor(Google_Service_Sheets_Color $positiveColor) + { + $this->positiveColor = $positiveColor; + } + /** + * @return Google_Service_Sheets_Color + */ + public function getPositiveColor() + { + return $this->positiveColor; + } + /** + * @param Google_Service_Sheets_TextFormat + */ + public function setTextFormat(Google_Service_Sheets_TextFormat $textFormat) + { + $this->textFormat = $textFormat; + } + /** + * @return Google_Service_Sheets_TextFormat + */ + public function getTextFormat() + { + return $this->textFormat; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Sheets/ChartCustomNumberFormatOptions.php b/vendor/google/apiclient-services/src/Google/Service/Sheets/ChartCustomNumberFormatOptions.php new file mode 100644 index 0000000..7a98fca --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Sheets/ChartCustomNumberFormatOptions.php @@ -0,0 +1,39 @@ +prefix = $prefix; + } + public function getPrefix() + { + return $this->prefix; + } + public function setSuffix($suffix) + { + $this->suffix = $suffix; + } + public function getSuffix() + { + return $this->suffix; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Sheets/ChartSpec.php b/vendor/google/apiclient-services/src/Google/Service/Sheets/ChartSpec.php index 03743ea..2f3b28f 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Sheets/ChartSpec.php +++ b/vendor/google/apiclient-services/src/Google/Service/Sheets/ChartSpec.php @@ -35,6 +35,8 @@ class Google_Service_Sheets_ChartSpec extends Google_Model protected $orgChartDataType = ''; protected $pieChartType = 'Google_Service_Sheets_PieChartSpec'; protected $pieChartDataType = ''; + protected $scorecardChartType = 'Google_Service_Sheets_ScorecardChartSpec'; + protected $scorecardChartDataType = ''; public $subtitle; protected $subtitleTextFormatType = 'Google_Service_Sheets_TextFormat'; protected $subtitleTextFormatDataType = ''; @@ -180,6 +182,20 @@ class Google_Service_Sheets_ChartSpec extends Google_Model { return $this->pieChart; } + /** + * @param Google_Service_Sheets_ScorecardChartSpec + */ + public function setScorecardChart(Google_Service_Sheets_ScorecardChartSpec $scorecardChart) + { + $this->scorecardChart = $scorecardChart; + } + /** + * @return Google_Service_Sheets_ScorecardChartSpec + */ + public function getScorecardChart() + { + return $this->scorecardChart; + } public function setSubtitle($subtitle) { $this->subtitle = $subtitle; diff --git a/vendor/google/apiclient-services/src/Google/Service/Sheets/KeyValueFormat.php b/vendor/google/apiclient-services/src/Google/Service/Sheets/KeyValueFormat.php new file mode 100644 index 0000000..7c4ed72 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Sheets/KeyValueFormat.php @@ -0,0 +1,53 @@ +position = $position; + } + /** + * @return Google_Service_Sheets_TextPosition + */ + public function getPosition() + { + return $this->position; + } + /** + * @param Google_Service_Sheets_TextFormat + */ + public function setTextFormat(Google_Service_Sheets_TextFormat $textFormat) + { + $this->textFormat = $textFormat; + } + /** + * @return Google_Service_Sheets_TextFormat + */ + public function getTextFormat() + { + return $this->textFormat; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Sheets/Resource/SpreadsheetsValues.php b/vendor/google/apiclient-services/src/Google/Service/Sheets/Resource/SpreadsheetsValues.php index 8dfdcee..b64097c 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Sheets/Resource/SpreadsheetsValues.php +++ b/vendor/google/apiclient-services/src/Google/Service/Sheets/Resource/SpreadsheetsValues.php @@ -44,11 +44,6 @@ class Google_Service_Sheets_Resource_SpreadsheetsValues extends Google_Service_R * @param Google_Service_Sheets_ValueRange $postBody * @param array $optParams Optional parameters. * - * @opt_param string responseValueRenderOption Determines how values in the - * response should be rendered. The default render option is - * ValueRenderOption.FORMATTED_VALUE. - * @opt_param string insertDataOption How the input data should be inserted. - * @opt_param string valueInputOption How the input data should be interpreted. * @opt_param string responseDateTimeRenderOption Determines how dates, times, * and durations in the response should be rendered. This is ignored if * response_value_render_option is FORMATTED_VALUE. The default dateTime render @@ -56,6 +51,11 @@ class Google_Service_Sheets_Resource_SpreadsheetsValues extends Google_Service_R * @opt_param bool includeValuesInResponse Determines if the update response * should include the values of the cells that were appended. By default, * responses do not include the updated values. + * @opt_param string responseValueRenderOption Determines how values in the + * response should be rendered. The default render option is + * ValueRenderOption.FORMATTED_VALUE. + * @opt_param string insertDataOption How the input data should be inserted. + * @opt_param string valueInputOption How the input data should be interpreted. * @return Google_Service_Sheets_AppendValuesResponse */ public function append($spreadsheetId, $range, Google_Service_Sheets_ValueRange $postBody, $optParams = array()) @@ -106,12 +106,6 @@ class Google_Service_Sheets_Resource_SpreadsheetsValues extends Google_Service_R * @param string $spreadsheetId The ID of the spreadsheet to retrieve data from. * @param array $optParams Optional parameters. * - * @opt_param string valueRenderOption How values should be represented in the - * output. The default render option is ValueRenderOption.FORMATTED_VALUE. - * @opt_param string dateTimeRenderOption How dates, times, and durations should - * be represented in the output. This is ignored if value_render_option is - * FORMATTED_VALUE. The default dateTime render option is - * [DateTimeRenderOption.SERIAL_NUMBER]. * @opt_param string ranges The A1 notation of the values to retrieve. * @opt_param string majorDimension The major dimension that results should use. * @@ -119,6 +113,12 @@ class Google_Service_Sheets_Resource_SpreadsheetsValues extends Google_Service_R * requesting `range=A1:B2,majorDimension=ROWS` will return `[[1,2],[3,4]]`, * whereas requesting `range=A1:B2,majorDimension=COLUMNS` will return * `[[1,3],[2,4]]`. + * @opt_param string valueRenderOption How values should be represented in the + * output. The default render option is ValueRenderOption.FORMATTED_VALUE. + * @opt_param string dateTimeRenderOption How dates, times, and durations should + * be represented in the output. This is ignored if value_render_option is + * FORMATTED_VALUE. The default dateTime render option is + * [DateTimeRenderOption.SERIAL_NUMBER]. * @return Google_Service_Sheets_BatchGetValuesResponse */ public function batchGet($spreadsheetId, $optParams = array()) @@ -201,18 +201,18 @@ class Google_Service_Sheets_Resource_SpreadsheetsValues extends Google_Service_R * @param string $range The A1 notation of the values to retrieve. * @param array $optParams Optional parameters. * - * @opt_param string majorDimension The major dimension that results should use. - * - * For example, if the spreadsheet data is: `A1=1,B1=2,A2=3,B2=4`, then - * requesting `range=A1:B2,majorDimension=ROWS` will return `[[1,2],[3,4]]`, - * whereas requesting `range=A1:B2,majorDimension=COLUMNS` will return - * `[[1,3],[2,4]]`. * @opt_param string valueRenderOption How values should be represented in the * output. The default render option is ValueRenderOption.FORMATTED_VALUE. * @opt_param string dateTimeRenderOption How dates, times, and durations should * be represented in the output. This is ignored if value_render_option is * FORMATTED_VALUE. The default dateTime render option is * [DateTimeRenderOption.SERIAL_NUMBER]. + * @opt_param string majorDimension The major dimension that results should use. + * + * For example, if the spreadsheet data is: `A1=1,B1=2,A2=3,B2=4`, then + * requesting `range=A1:B2,majorDimension=ROWS` will return `[[1,2],[3,4]]`, + * whereas requesting `range=A1:B2,majorDimension=COLUMNS` will return + * `[[1,3],[2,4]]`. * @return Google_Service_Sheets_ValueRange */ public function get($spreadsheetId, $range, $optParams = array()) @@ -230,11 +230,6 @@ class Google_Service_Sheets_Resource_SpreadsheetsValues extends Google_Service_R * @param Google_Service_Sheets_ValueRange $postBody * @param array $optParams Optional parameters. * - * @opt_param bool includeValuesInResponse Determines if the update response - * should include the values of the cells that were updated. By default, - * responses do not include the updated values. If the range to write was larger - * than than the range actually written, the response will include all values in - * the requested range (excluding trailing empty rows and columns). * @opt_param string responseValueRenderOption Determines how values in the * response should be rendered. The default render option is * ValueRenderOption.FORMATTED_VALUE. @@ -243,6 +238,11 @@ class Google_Service_Sheets_Resource_SpreadsheetsValues extends Google_Service_R * and durations in the response should be rendered. This is ignored if * response_value_render_option is FORMATTED_VALUE. The default dateTime render * option is DateTimeRenderOption.SERIAL_NUMBER. + * @opt_param bool includeValuesInResponse Determines if the update response + * should include the values of the cells that were updated. By default, + * responses do not include the updated values. If the range to write was larger + * than than the range actually written, the response will include all values in + * the requested range (excluding trailing empty rows and columns). * @return Google_Service_Sheets_UpdateValuesResponse */ public function update($spreadsheetId, $range, Google_Service_Sheets_ValueRange $postBody, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Sheets/ScorecardChartSpec.php b/vendor/google/apiclient-services/src/Google/Service/Sheets/ScorecardChartSpec.php new file mode 100644 index 0000000..4710fc3 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Sheets/ScorecardChartSpec.php @@ -0,0 +1,128 @@ +aggregateType = $aggregateType; + } + public function getAggregateType() + { + return $this->aggregateType; + } + /** + * @param Google_Service_Sheets_ChartData + */ + public function setBaselineValueData(Google_Service_Sheets_ChartData $baselineValueData) + { + $this->baselineValueData = $baselineValueData; + } + /** + * @return Google_Service_Sheets_ChartData + */ + public function getBaselineValueData() + { + return $this->baselineValueData; + } + /** + * @param Google_Service_Sheets_BaselineValueFormat + */ + public function setBaselineValueFormat(Google_Service_Sheets_BaselineValueFormat $baselineValueFormat) + { + $this->baselineValueFormat = $baselineValueFormat; + } + /** + * @return Google_Service_Sheets_BaselineValueFormat + */ + public function getBaselineValueFormat() + { + return $this->baselineValueFormat; + } + /** + * @param Google_Service_Sheets_ChartCustomNumberFormatOptions + */ + public function setCustomFormatOptions(Google_Service_Sheets_ChartCustomNumberFormatOptions $customFormatOptions) + { + $this->customFormatOptions = $customFormatOptions; + } + /** + * @return Google_Service_Sheets_ChartCustomNumberFormatOptions + */ + public function getCustomFormatOptions() + { + return $this->customFormatOptions; + } + /** + * @param Google_Service_Sheets_ChartData + */ + public function setKeyValueData(Google_Service_Sheets_ChartData $keyValueData) + { + $this->keyValueData = $keyValueData; + } + /** + * @return Google_Service_Sheets_ChartData + */ + public function getKeyValueData() + { + return $this->keyValueData; + } + /** + * @param Google_Service_Sheets_KeyValueFormat + */ + public function setKeyValueFormat(Google_Service_Sheets_KeyValueFormat $keyValueFormat) + { + $this->keyValueFormat = $keyValueFormat; + } + /** + * @return Google_Service_Sheets_KeyValueFormat + */ + public function getKeyValueFormat() + { + return $this->keyValueFormat; + } + public function setNumberFormatSource($numberFormatSource) + { + $this->numberFormatSource = $numberFormatSource; + } + public function getNumberFormatSource() + { + return $this->numberFormatSource; + } + public function setScaleFactor($scaleFactor) + { + $this->scaleFactor = $scaleFactor; + } + public function getScaleFactor() + { + return $this->scaleFactor; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/ShoppingContent/Order.php b/vendor/google/apiclient-services/src/Google/Service/ShoppingContent/Order.php index b53b338..3f47fd2 100644 --- a/vendor/google/apiclient-services/src/Google/Service/ShoppingContent/Order.php +++ b/vendor/google/apiclient-services/src/Google/Service/ShoppingContent/Order.php @@ -36,6 +36,8 @@ class Google_Service_ShoppingContent_Order extends Google_Collection protected $netTaxAmountType = 'Google_Service_ShoppingContent_Price'; protected $netTaxAmountDataType = ''; public $paymentStatus; + protected $pickupDetailsType = 'Google_Service_ShoppingContent_OrderPickupDetails'; + protected $pickupDetailsDataType = ''; public $placedDate; protected $promotionsType = 'Google_Service_ShoppingContent_OrderPromotion'; protected $promotionsDataType = 'array'; @@ -182,6 +184,20 @@ class Google_Service_ShoppingContent_Order extends Google_Collection { return $this->paymentStatus; } + /** + * @param Google_Service_ShoppingContent_OrderPickupDetails + */ + public function setPickupDetails(Google_Service_ShoppingContent_OrderPickupDetails $pickupDetails) + { + $this->pickupDetails = $pickupDetails; + } + /** + * @return Google_Service_ShoppingContent_OrderPickupDetails + */ + public function getPickupDetails() + { + return $this->pickupDetails; + } public function setPlacedDate($placedDate) { $this->placedDate = $placedDate; diff --git a/vendor/google/apiclient-services/src/Google/Service/ShoppingContent/OrderLineItem.php b/vendor/google/apiclient-services/src/Google/Service/ShoppingContent/OrderLineItem.php index 017a7db..7a8aa59 100644 --- a/vendor/google/apiclient-services/src/Google/Service/ShoppingContent/OrderLineItem.php +++ b/vendor/google/apiclient-services/src/Google/Service/ShoppingContent/OrderLineItem.php @@ -33,6 +33,7 @@ class Google_Service_ShoppingContent_OrderLineItem extends Google_Collection public $quantityDelivered; public $quantityOrdered; public $quantityPending; + public $quantityReadyForPickup; public $quantityReturned; public $quantityShipped; public $quantityUndeliverable; @@ -155,6 +156,14 @@ class Google_Service_ShoppingContent_OrderLineItem extends Google_Collection { return $this->quantityPending; } + public function setQuantityReadyForPickup($quantityReadyForPickup) + { + $this->quantityReadyForPickup = $quantityReadyForPickup; + } + public function getQuantityReadyForPickup() + { + return $this->quantityReadyForPickup; + } public function setQuantityReturned($quantityReturned) { $this->quantityReturned = $quantityReturned; diff --git a/vendor/google/apiclient-services/src/Google/Service/ShoppingContent/OrderLineItemShippingDetails.php b/vendor/google/apiclient-services/src/Google/Service/ShoppingContent/OrderLineItemShippingDetails.php index efa53d2..c468a00 100644 --- a/vendor/google/apiclient-services/src/Google/Service/ShoppingContent/OrderLineItemShippingDetails.php +++ b/vendor/google/apiclient-services/src/Google/Service/ShoppingContent/OrderLineItemShippingDetails.php @@ -21,6 +21,7 @@ class Google_Service_ShoppingContent_OrderLineItemShippingDetails extends Google protected $methodType = 'Google_Service_ShoppingContent_OrderLineItemShippingDetailsMethod'; protected $methodDataType = ''; public $shipByDate; + public $type; public function setDeliverByDate($deliverByDate) { @@ -52,4 +53,12 @@ class Google_Service_ShoppingContent_OrderLineItemShippingDetails extends Google { return $this->shipByDate; } + public function setType($type) + { + $this->type = $type; + } + public function getType() + { + return $this->type; + } } diff --git a/vendor/google/apiclient-services/src/Google/Service/ShoppingContent/OrderPickupDetails.php b/vendor/google/apiclient-services/src/Google/Service/ShoppingContent/OrderPickupDetails.php new file mode 100644 index 0000000..f76a037 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/ShoppingContent/OrderPickupDetails.php @@ -0,0 +1,63 @@ +address = $address; + } + /** + * @return Google_Service_ShoppingContent_OrderAddress + */ + public function getAddress() + { + return $this->address; + } + /** + * @param Google_Service_ShoppingContent_OrderPickupDetailsCollector + */ + public function setCollectors($collectors) + { + $this->collectors = $collectors; + } + /** + * @return Google_Service_ShoppingContent_OrderPickupDetailsCollector + */ + public function getCollectors() + { + return $this->collectors; + } + public function setLocationId($locationId) + { + $this->locationId = $locationId; + } + public function getLocationId() + { + return $this->locationId; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/ShoppingContent/OrderPickupDetailsCollector.php b/vendor/google/apiclient-services/src/Google/Service/ShoppingContent/OrderPickupDetailsCollector.php new file mode 100644 index 0000000..bbfe715 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/ShoppingContent/OrderPickupDetailsCollector.php @@ -0,0 +1,39 @@ +name = $name; + } + public function getName() + { + return $this->name; + } + public function setPhoneNumber($phoneNumber) + { + $this->phoneNumber = $phoneNumber; + } + public function getPhoneNumber() + { + return $this->phoneNumber; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/ShoppingContent/OrderPromotion.php b/vendor/google/apiclient-services/src/Google/Service/ShoppingContent/OrderPromotion.php index 819fbbd..a8a26a8 100644 --- a/vendor/google/apiclient-services/src/Google/Service/ShoppingContent/OrderPromotion.php +++ b/vendor/google/apiclient-services/src/Google/Service/ShoppingContent/OrderPromotion.php @@ -22,11 +22,13 @@ class Google_Service_ShoppingContent_OrderPromotion extends Google_Collection protected $applicableItemsDataType = 'array'; protected $appliedItemsType = 'Google_Service_ShoppingContent_OrderPromotionItem'; protected $appliedItemsDataType = 'array'; + public $endTime; public $funder; public $merchantPromotionId; protected $priceValueType = 'Google_Service_ShoppingContent_Price'; protected $priceValueDataType = ''; public $shortTitle; + public $startTime; public $subtype; protected $taxValueType = 'Google_Service_ShoppingContent_Price'; protected $taxValueDataType = ''; @@ -61,6 +63,14 @@ class Google_Service_ShoppingContent_OrderPromotion extends Google_Collection { return $this->appliedItems; } + public function setEndTime($endTime) + { + $this->endTime = $endTime; + } + public function getEndTime() + { + return $this->endTime; + } public function setFunder($funder) { $this->funder = $funder; @@ -99,6 +109,14 @@ class Google_Service_ShoppingContent_OrderPromotion extends Google_Collection { return $this->shortTitle; } + public function setStartTime($startTime) + { + $this->startTime = $startTime; + } + public function getStartTime() + { + return $this->startTime; + } public function setSubtype($subtype) { $this->subtype = $subtype; diff --git a/vendor/google/apiclient-services/src/Google/Service/ShoppingContent/OrderPromotionItem.php b/vendor/google/apiclient-services/src/Google/Service/ShoppingContent/OrderPromotionItem.php index 0e9a4a8..fa83199 100644 --- a/vendor/google/apiclient-services/src/Google/Service/ShoppingContent/OrderPromotionItem.php +++ b/vendor/google/apiclient-services/src/Google/Service/ShoppingContent/OrderPromotionItem.php @@ -18,6 +18,7 @@ class Google_Service_ShoppingContent_OrderPromotionItem extends Google_Model { public $lineItemId; + public $offerId; public $productId; public $quantity; @@ -29,6 +30,14 @@ class Google_Service_ShoppingContent_OrderPromotionItem extends Google_Model { return $this->lineItemId; } + public function setOfferId($offerId) + { + $this->offerId = $offerId; + } + public function getOfferId() + { + return $this->offerId; + } public function setProductId($productId) { $this->productId = $productId; diff --git a/vendor/google/apiclient-services/src/Google/Service/ShoppingContent/TestOrder.php b/vendor/google/apiclient-services/src/Google/Service/ShoppingContent/TestOrder.php index 3bf722c..b893ea4 100644 --- a/vendor/google/apiclient-services/src/Google/Service/ShoppingContent/TestOrder.php +++ b/vendor/google/apiclient-services/src/Google/Service/ShoppingContent/TestOrder.php @@ -26,6 +26,7 @@ class Google_Service_ShoppingContent_TestOrder extends Google_Collection public $predefinedBillingAddress; public $predefinedDeliveryAddress; public $predefinedEmail; + public $predefinedPickupDetails; protected $promotionsType = 'Google_Service_ShoppingContent_OrderPromotion'; protected $promotionsDataType = 'array'; protected $shippingCostType = 'Google_Service_ShoppingContent_Price'; @@ -94,6 +95,14 @@ class Google_Service_ShoppingContent_TestOrder extends Google_Collection { return $this->predefinedEmail; } + public function setPredefinedPickupDetails($predefinedPickupDetails) + { + $this->predefinedPickupDetails = $predefinedPickupDetails; + } + public function getPredefinedPickupDetails() + { + return $this->predefinedPickupDetails; + } /** * @param Google_Service_ShoppingContent_OrderPromotion */ diff --git a/vendor/google/apiclient-services/src/Google/Service/Spanner.php b/vendor/google/apiclient-services/src/Google/Service/Spanner.php index 663452e..d5ee526 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Spanner.php +++ b/vendor/google/apiclient-services/src/Google/Service/Spanner.php @@ -88,14 +88,14 @@ class Google_Service_Spanner extends Google_Service 'type' => 'string', 'required' => true, ), - 'pageToken' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageSize' => array( 'location' => 'query', 'type' => 'integer', ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ), ) @@ -156,10 +156,6 @@ class Google_Service_Spanner extends Google_Service 'type' => 'string', 'required' => true, ), - 'pageToken' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageSize' => array( 'location' => 'query', 'type' => 'integer', @@ -168,6 +164,10 @@ class Google_Service_Spanner extends Google_Service 'location' => 'query', 'type' => 'string', ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'patch' => array( 'path' => 'v1/{+name}', @@ -379,7 +379,17 @@ class Google_Service_Spanner extends Google_Service 'sessions', array( 'methods' => array( - 'beginTransaction' => array( + 'batchCreate' => array( + 'path' => 'v1/{+database}/sessions:batchCreate', + 'httpMethod' => 'POST', + 'parameters' => array( + 'database' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ),'beginTransaction' => array( 'path' => 'v1/{+session}:beginTransaction', 'httpMethod' => 'POST', 'parameters' => array( @@ -468,10 +478,6 @@ class Google_Service_Spanner extends Google_Service 'type' => 'string', 'required' => true, ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -480,6 +486,10 @@ class Google_Service_Spanner extends Google_Service 'location' => 'query', 'type' => 'integer', ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ),'partitionQuery' => array( 'path' => 'v1/{+session}:partitionQuery', @@ -580,6 +590,10 @@ class Google_Service_Spanner extends Google_Service 'type' => 'string', 'required' => true, ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -588,10 +602,6 @@ class Google_Service_Spanner extends Google_Service 'location' => 'query', 'type' => 'integer', ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), ), ), ) diff --git a/vendor/google/apiclient-services/src/Google/Service/Spanner/BatchCreateSessionsRequest.php b/vendor/google/apiclient-services/src/Google/Service/Spanner/BatchCreateSessionsRequest.php new file mode 100644 index 0000000..97b719b --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Spanner/BatchCreateSessionsRequest.php @@ -0,0 +1,46 @@ +sessionCount = $sessionCount; + } + public function getSessionCount() + { + return $this->sessionCount; + } + /** + * @param Google_Service_Spanner_Session + */ + public function setSessionTemplate(Google_Service_Spanner_Session $sessionTemplate) + { + $this->sessionTemplate = $sessionTemplate; + } + /** + * @return Google_Service_Spanner_Session + */ + public function getSessionTemplate() + { + return $this->sessionTemplate; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Spanner/BatchCreateSessionsResponse.php b/vendor/google/apiclient-services/src/Google/Service/Spanner/BatchCreateSessionsResponse.php new file mode 100644 index 0000000..6de9e0e --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Spanner/BatchCreateSessionsResponse.php @@ -0,0 +1,38 @@ +session = $session; + } + /** + * @return Google_Service_Spanner_Session + */ + public function getSession() + { + return $this->session; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Spanner/GetIamPolicyRequest.php b/vendor/google/apiclient-services/src/Google/Service/Spanner/GetIamPolicyRequest.php index b787732..9aa04e6 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Spanner/GetIamPolicyRequest.php +++ b/vendor/google/apiclient-services/src/Google/Service/Spanner/GetIamPolicyRequest.php @@ -17,4 +17,21 @@ class Google_Service_Spanner_GetIamPolicyRequest extends Google_Model { + protected $optionsType = 'Google_Service_Spanner_GetPolicyOptions'; + protected $optionsDataType = ''; + + /** + * @param Google_Service_Spanner_GetPolicyOptions + */ + public function setOptions(Google_Service_Spanner_GetPolicyOptions $options) + { + $this->options = $options; + } + /** + * @return Google_Service_Spanner_GetPolicyOptions + */ + public function getOptions() + { + return $this->options; + } } diff --git a/vendor/google/apiclient-services/src/Google/Service/Spanner/GetPolicyOptions.php b/vendor/google/apiclient-services/src/Google/Service/Spanner/GetPolicyOptions.php new file mode 100644 index 0000000..570e092 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Spanner/GetPolicyOptions.php @@ -0,0 +1,30 @@ +requestedPolicyVersion = $requestedPolicyVersion; + } + public function getRequestedPolicyVersion() + { + return $this->requestedPolicyVersion; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstanceConfigs.php b/vendor/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstanceConfigs.php index 65cefa7..80f8c2c 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstanceConfigs.php +++ b/vendor/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstanceConfigs.php @@ -49,11 +49,11 @@ class Google_Service_Spanner_Resource_ProjectsInstanceConfigs extends Google_Ser * `projects/`. * @param array $optParams Optional parameters. * - * @opt_param string pageToken If non-empty, `page_token` should contain a - * next_page_token from a previous ListInstanceConfigsResponse. * @opt_param int pageSize Number of instance configurations to be returned in * the response. If 0 or less, defaults to the server's maximum allowed page * size. + * @opt_param string pageToken If non-empty, `page_token` should contain a + * next_page_token from a previous ListInstanceConfigsResponse. * @return Google_Service_Spanner_ListInstanceConfigsResponse */ public function listProjectsInstanceConfigs($parent, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstances.php b/vendor/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstances.php index b9f72af..c612f03 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstances.php +++ b/vendor/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstances.php @@ -131,8 +131,6 @@ class Google_Service_Spanner_Resource_ProjectsInstances extends Google_Service_R * instances is requested. Values are of the form `projects/`. * @param array $optParams Optional parameters. * - * @opt_param string pageToken If non-empty, `page_token` should contain a - * next_page_token from a previous ListInstancesResponse. * @opt_param int pageSize Number of instances to be returned in the response. * If 0 or less, defaults to the server's maximum allowed page size. * @opt_param string filter An expression for filtering the results of the @@ -152,6 +150,8 @@ class Google_Service_Spanner_Resource_ProjectsInstances extends Google_Service_R * * `name:howl labels.env:dev` --> The instance's name contains "howl" and * it has the label "env" with its value * containing "dev". + * @opt_param string pageToken If non-empty, `page_token` should contain a + * next_page_token from a previous ListInstancesResponse. * @return Google_Service_Spanner_ListInstancesResponse */ public function listProjectsInstances($parent, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstancesDatabasesSessions.php b/vendor/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstancesDatabasesSessions.php index 76d2fbb..920775e 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstancesDatabasesSessions.php +++ b/vendor/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstancesDatabasesSessions.php @@ -25,6 +25,25 @@ */ class Google_Service_Spanner_Resource_ProjectsInstancesDatabasesSessions extends Google_Service_Resource { + /** + * Creates multiple new sessions. + * + * This API can be used to initialize a session cache on the clients. See + * https://goo.gl/TgSFN2 for best practices on session cache management. + * (sessions.batchCreate) + * + * @param string $database Required. The database in which the new sessions are + * created. + * @param Google_Service_Spanner_BatchCreateSessionsRequest $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_Spanner_BatchCreateSessionsResponse + */ + public function batchCreate($database, Google_Service_Spanner_BatchCreateSessionsRequest $postBody, $optParams = array()) + { + $params = array('database' => $database, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('batchCreate', array($params), "Google_Service_Spanner_BatchCreateSessionsResponse"); + } /** * Begins a new transaction. This step can often be skipped: Read, ExecuteSql * and Commit can begin a new transaction as a side-effect. @@ -197,6 +216,10 @@ class Google_Service_Spanner_Resource_ProjectsInstancesDatabasesSessions extends * @param string $database Required. The database in which to list sessions. * @param array $optParams Optional parameters. * + * @opt_param string pageToken If non-empty, `page_token` should contain a + * next_page_token from a previous ListSessionsResponse. + * @opt_param int pageSize Number of sessions to be returned in the response. If + * 0 or less, defaults to the server's maximum allowed page size. * @opt_param string filter An expression for filtering the results of the * request. Filter rules are case insensitive. The fields eligible for filtering * are: @@ -208,10 +231,6 @@ class Google_Service_Spanner_Resource_ProjectsInstancesDatabasesSessions extends * * `labels.env:*` --> The session has the label "env". * `labels.env:dev` * --> The session has the label "env" and the value of * the label contains the string "dev". - * @opt_param string pageToken If non-empty, `page_token` should contain a - * next_page_token from a previous ListSessionsResponse. - * @opt_param int pageSize Number of sessions to be returned in the response. If - * 0 or less, defaults to the server's maximum allowed page size. * @return Google_Service_Spanner_ListSessionsResponse */ public function listProjectsInstancesDatabasesSessions($database, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstancesOperations.php b/vendor/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstancesOperations.php index d25ba30..9d2e319 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstancesOperations.php +++ b/vendor/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstancesOperations.php @@ -93,9 +93,9 @@ class Google_Service_Spanner_Resource_ProjectsInstancesOperations extends Google * @param string $name The name of the operation's parent resource. * @param array $optParams Optional parameters. * + * @opt_param string filter The standard list filter. * @opt_param string pageToken The standard list page token. * @opt_param int pageSize The standard list page size. - * @opt_param string filter The standard list filter. * @return Google_Service_Spanner_ListOperationsResponse */ public function listProjectsInstancesOperations($name, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Speech/RecognitionConfig.php b/vendor/google/apiclient-services/src/Google/Service/Speech/RecognitionConfig.php index b5c6fc1..f532bc5 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Speech/RecognitionConfig.php +++ b/vendor/google/apiclient-services/src/Google/Service/Speech/RecognitionConfig.php @@ -19,6 +19,8 @@ class Google_Service_Speech_RecognitionConfig extends Google_Collection { protected $collection_key = 'speechContexts'; public $audioChannelCount; + protected $diarizationConfigType = 'Google_Service_Speech_SpeakerDiarizationConfig'; + protected $diarizationConfigDataType = ''; public $enableAutomaticPunctuation; public $enableSeparateRecognitionPerChannel; public $enableWordTimeOffsets; @@ -42,6 +44,20 @@ class Google_Service_Speech_RecognitionConfig extends Google_Collection { return $this->audioChannelCount; } + /** + * @param Google_Service_Speech_SpeakerDiarizationConfig + */ + public function setDiarizationConfig(Google_Service_Speech_SpeakerDiarizationConfig $diarizationConfig) + { + $this->diarizationConfig = $diarizationConfig; + } + /** + * @return Google_Service_Speech_SpeakerDiarizationConfig + */ + public function getDiarizationConfig() + { + return $this->diarizationConfig; + } public function setEnableAutomaticPunctuation($enableAutomaticPunctuation) { $this->enableAutomaticPunctuation = $enableAutomaticPunctuation; diff --git a/vendor/google/apiclient-services/src/Google/Service/Speech/SpeakerDiarizationConfig.php b/vendor/google/apiclient-services/src/Google/Service/Speech/SpeakerDiarizationConfig.php new file mode 100644 index 0000000..79374bf --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Speech/SpeakerDiarizationConfig.php @@ -0,0 +1,48 @@ +enableSpeakerDiarization = $enableSpeakerDiarization; + } + public function getEnableSpeakerDiarization() + { + return $this->enableSpeakerDiarization; + } + public function setMaxSpeakerCount($maxSpeakerCount) + { + $this->maxSpeakerCount = $maxSpeakerCount; + } + public function getMaxSpeakerCount() + { + return $this->maxSpeakerCount; + } + public function setMinSpeakerCount($minSpeakerCount) + { + $this->minSpeakerCount = $minSpeakerCount; + } + public function getMinSpeakerCount() + { + return $this->minSpeakerCount; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Speech/WordInfo.php b/vendor/google/apiclient-services/src/Google/Service/Speech/WordInfo.php index 4bb2193..0a644c4 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Speech/WordInfo.php +++ b/vendor/google/apiclient-services/src/Google/Service/Speech/WordInfo.php @@ -18,6 +18,7 @@ class Google_Service_Speech_WordInfo extends Google_Model { public $endTime; + public $speakerTag; public $startTime; public $word; @@ -29,6 +30,14 @@ class Google_Service_Speech_WordInfo extends Google_Model { return $this->endTime; } + public function setSpeakerTag($speakerTag) + { + $this->speakerTag = $speakerTag; + } + public function getSpeakerTag() + { + return $this->speakerTag; + } public function setStartTime($startTime) { $this->startTime = $startTime; diff --git a/vendor/google/apiclient-services/src/Google/Service/Storage.php b/vendor/google/apiclient-services/src/Google/Service/Storage.php index 1803b2c..7811445 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Storage.php +++ b/vendor/google/apiclient-services/src/Google/Service/Storage.php @@ -280,6 +280,10 @@ class Google_Service_Storage extends Google_Service 'type' => 'string', 'required' => true, ), + 'optionsRequestedPolicyVersion' => array( + 'location' => 'query', + 'type' => 'integer', + ), 'provisionalUserProject' => array( 'location' => 'query', 'type' => 'string', diff --git a/vendor/google/apiclient-services/src/Google/Service/Storage/Policy.php b/vendor/google/apiclient-services/src/Google/Service/Storage/Policy.php index 8a362c0..2e586b9 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Storage/Policy.php +++ b/vendor/google/apiclient-services/src/Google/Service/Storage/Policy.php @@ -23,6 +23,7 @@ class Google_Service_Storage_Policy extends Google_Collection public $etag; public $kind; public $resourceId; + public $version; /** * @param Google_Service_Storage_PolicyBindings @@ -62,4 +63,12 @@ class Google_Service_Storage_Policy extends Google_Collection { return $this->resourceId; } + public function setVersion($version) + { + $this->version = $version; + } + public function getVersion() + { + return $this->version; + } } diff --git a/vendor/google/apiclient-services/src/Google/Service/Storage/Resource/Buckets.php b/vendor/google/apiclient-services/src/Google/Service/Storage/Resource/Buckets.php index 1cfb078..f5a5fb8 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Storage/Resource/Buckets.php +++ b/vendor/google/apiclient-services/src/Google/Service/Storage/Resource/Buckets.php @@ -77,6 +77,9 @@ class Google_Service_Storage_Resource_Buckets extends Google_Service_Resource * @param string $bucket Name of a bucket. * @param array $optParams Optional parameters. * + * @opt_param int optionsRequestedPolicyVersion The IAM policy format version to + * be returned. If the optionsRequestedPolicyVersion is for an older version + * that doesn't support part of the requested IAM policy, the request fails. * @opt_param string provisionalUserProject The project to be billed for this * request if the target bucket is requester-pays bucket. * @opt_param string userProject The project to be billed for this request. diff --git a/vendor/google/apiclient-services/src/Google/Service/Storagetransfer.php b/vendor/google/apiclient-services/src/Google/Service/Storagetransfer.php index 8b1a4b8..77e4855 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Storagetransfer.php +++ b/vendor/google/apiclient-services/src/Google/Service/Storagetransfer.php @@ -102,6 +102,10 @@ class Google_Service_Storagetransfer extends Google_Service 'path' => 'v1/transferJobs', 'httpMethod' => 'GET', 'parameters' => array( + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -110,10 +114,6 @@ class Google_Service_Storagetransfer extends Google_Service 'location' => 'query', 'type' => 'integer', ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), ), ),'patch' => array( 'path' => 'v1/{+jobName}', diff --git a/vendor/google/apiclient-services/src/Google/Service/Storagetransfer/Resource/TransferJobs.php b/vendor/google/apiclient-services/src/Google/Service/Storagetransfer/Resource/TransferJobs.php index 7822f77..44a3db6 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Storagetransfer/Resource/TransferJobs.php +++ b/vendor/google/apiclient-services/src/Google/Service/Storagetransfer/Resource/TransferJobs.php @@ -59,8 +59,6 @@ class Google_Service_Storagetransfer_Resource_TransferJobs extends Google_Servic * * @param array $optParams Optional parameters. * - * @opt_param string pageToken The list page token. - * @opt_param int pageSize The list page size. The max allowed value is 256. * @opt_param string filter Required. A list of query parameters specified as * JSON text in the form of: {"project_id":"my_project_id", * "job_names":["jobid1","jobid2",...], @@ -69,6 +67,8 @@ class Google_Service_Storagetransfer_Resource_TransferJobs extends Google_Servic * array notation. `project_id` is required. `job_names` and `job_statuses` are * optional. The valid values for `job_statuses` are case-insensitive: * `ENABLED`, `DISABLED`, and `DELETED`. + * @opt_param string pageToken The list page token. + * @opt_param int pageSize The list page size. The max allowed value is 256. * @return Google_Service_Storagetransfer_ListTransferJobsResponse */ public function listTransferJobs($optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Storagetransfer/Resource/TransferOperations.php b/vendor/google/apiclient-services/src/Google/Service/Storagetransfer/Resource/TransferOperations.php index 909d384..ef1853f 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Storagetransfer/Resource/TransferOperations.php +++ b/vendor/google/apiclient-services/src/Google/Service/Storagetransfer/Resource/TransferOperations.php @@ -70,17 +70,7 @@ class Google_Service_Storagetransfer_Resource_TransferOperations extends Google_ return $this->call('get', array($params), "Google_Service_Storagetransfer_Operation"); } /** - * Lists operations that match the specified filter in the request. If the - * server doesn't support this method, it returns `UNIMPLEMENTED`. - * - * NOTE: the `name` binding allows API services to override the binding to use - * different resource name schemes, such as `users/operations`. To override the - * binding, API services can add a binding such as - * `"/v1/{name=users}/operations"` to their service configuration. For backwards - * compatibility, the default name includes the operations collection id, - * however overriding users must ensure the name binding is the parent resource, - * without the operations collection id. - * (transferOperations.listTransferOperations) + * Lists transfer operations. (transferOperations.listTransferOperations) * * @param string $name Required. The value `transferOperations`. * @param array $optParams Optional parameters. diff --git a/vendor/google/apiclient-services/src/Google/Service/StreetViewPublish.php b/vendor/google/apiclient-services/src/Google/Service/StreetViewPublish.php index 0a1fe75..6de8f9f 100644 --- a/vendor/google/apiclient-services/src/Google/Service/StreetViewPublish.php +++ b/vendor/google/apiclient-services/src/Google/Service/StreetViewPublish.php @@ -83,11 +83,11 @@ class Google_Service_StreetViewPublish extends Google_Service 'type' => 'string', 'required' => true, ), - 'view' => array( + 'languageCode' => array( 'location' => 'query', 'type' => 'string', ), - 'languageCode' => array( + 'view' => array( 'location' => 'query', 'type' => 'string', ), @@ -128,11 +128,6 @@ class Google_Service_StreetViewPublish extends Google_Service 'path' => 'v1/photos:batchGet', 'httpMethod' => 'GET', 'parameters' => array( - 'photoIds' => array( - 'location' => 'query', - 'type' => 'string', - 'repeated' => true, - ), 'view' => array( 'location' => 'query', 'type' => 'string', @@ -141,6 +136,11 @@ class Google_Service_StreetViewPublish extends Google_Service 'location' => 'query', 'type' => 'string', ), + 'photoIds' => array( + 'location' => 'query', + 'type' => 'string', + 'repeated' => true, + ), ), ),'batchUpdate' => array( 'path' => 'v1/photos:batchUpdate', @@ -150,14 +150,6 @@ class Google_Service_StreetViewPublish extends Google_Service 'path' => 'v1/photos', 'httpMethod' => 'GET', 'parameters' => array( - 'pageToken' => array( - 'location' => 'query', - 'type' => 'string', - ), - 'pageSize' => array( - 'location' => 'query', - 'type' => 'integer', - ), 'view' => array( 'location' => 'query', 'type' => 'string', @@ -170,6 +162,14 @@ class Google_Service_StreetViewPublish extends Google_Service 'location' => 'query', 'type' => 'string', ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'pageSize' => array( + 'location' => 'query', + 'type' => 'integer', + ), ), ), ) diff --git a/vendor/google/apiclient-services/src/Google/Service/StreetViewPublish/Resource/Photo.php b/vendor/google/apiclient-services/src/Google/Service/StreetViewPublish/Resource/Photo.php index 3985f14..8036746 100644 --- a/vendor/google/apiclient-services/src/Google/Service/StreetViewPublish/Resource/Photo.php +++ b/vendor/google/apiclient-services/src/Google/Service/StreetViewPublish/Resource/Photo.php @@ -84,13 +84,13 @@ class Google_Service_StreetViewPublish_Resource_Photo extends Google_Service_Res * @param string $photoId Required. ID of the Photo. * @param array $optParams Optional parameters. * - * @opt_param string view Specifies if a download URL for the photo bytes should - * be returned in the Photo response. * @opt_param string languageCode The BCP-47 language code, such as "en-US" or * "sr-Latn". For more information, see * http://www.unicode.org/reports/tr35/#Unicode_locale_identifier. If * language_code is unspecified, the user's language preference for Google * services is used. + * @opt_param string view Required. Specifies if a download URL for the photo + * bytes should be returned in the Photo response. * @return Google_Service_StreetViewPublish_Photo */ public function get($photoId, $optParams = array()) @@ -145,8 +145,8 @@ class Google_Service_StreetViewPublish_Resource_Photo extends Google_Service_Res * @param Google_Service_StreetViewPublish_Photo $postBody * @param array $optParams Optional parameters. * - * @opt_param string updateMask Mask that identifies fields on the photo - * metadata to update. If not present, the old Photo metadata is entirely + * @opt_param string updateMask Required. Mask that identifies fields on the + * photo metadata to update. If not present, the old Photo metadata is entirely * replaced with the new Photo metadata in this request. The update fails if * invalid fields are specified. Multiple fields can be specified in a comma- * delimited list. diff --git a/vendor/google/apiclient-services/src/Google/Service/StreetViewPublish/Resource/Photos.php b/vendor/google/apiclient-services/src/Google/Service/StreetViewPublish/Resource/Photos.php index 93ac7a4..8e02232 100644 --- a/vendor/google/apiclient-services/src/Google/Service/StreetViewPublish/Resource/Photos.php +++ b/vendor/google/apiclient-services/src/Google/Service/StreetViewPublish/Resource/Photos.php @@ -56,15 +56,15 @@ class Google_Service_StreetViewPublish_Resource_Photos extends Google_Service_Re * * @param array $optParams Optional parameters. * - * @opt_param string photoIds Required. IDs of the Photos. For HTTP GET - * requests, the URL query parameter should be `photoIds==&...`. - * @opt_param string view Specifies if a download URL for the photo bytes should - * be returned in the Photo response. + * @opt_param string view Required. Specifies if a download URL for the photo + * bytes should be returned in the Photo response. * @opt_param string languageCode The BCP-47 language code, such as "en-US" or * "sr-Latn". For more information, see * http://www.unicode.org/reports/tr35/#Unicode_locale_identifier. If * language_code is unspecified, the user's language preference for Google * services is used. + * @opt_param string photoIds Required. IDs of the Photos. For HTTP GET + * requests, the URL query parameter should be `photoIds==&...`. * @return Google_Service_StreetViewPublish_BatchGetPhotosResponse */ public function batchGet($optParams = array()) @@ -110,16 +110,9 @@ class Google_Service_StreetViewPublish_Resource_Photos extends Google_Service_Re * * @param array $optParams Optional parameters. * - * @opt_param string pageToken The nextPageToken value returned from a previous - * ListPhotos request, if any. - * @opt_param int pageSize The maximum number of photos to return. `pageSize` - * must be non-negative. If `pageSize` is zero or is not provided, the default - * page size of 100 is used. The number of photos returned in the response may - * be less than `pageSize` if the number of photos that belong to the user is - * less than `pageSize`. - * @opt_param string view Specifies if a download URL for the photos bytes - * should be returned in the Photos response. - * @opt_param string filter The filter expression. For example: + * @opt_param string view Required. Specifies if a download URL for the photos + * bytes should be returned in the Photos response. + * @opt_param string filter Required. The filter expression. For example: * `placeId=ChIJj61dQgK6j4AR4GeTYWZsKWw`. * * The only filter supported at the moment is `placeId`. @@ -128,6 +121,13 @@ class Google_Service_StreetViewPublish_Resource_Photos extends Google_Service_Re * http://www.unicode.org/reports/tr35/#Unicode_locale_identifier. If * language_code is unspecified, the user's language preference for Google * services is used. + * @opt_param string pageToken The nextPageToken value returned from a previous + * ListPhotos request, if any. + * @opt_param int pageSize The maximum number of photos to return. `pageSize` + * must be non-negative. If `pageSize` is zero or is not provided, the default + * page size of 100 is used. The number of photos returned in the response may + * be less than `pageSize` if the number of photos that belong to the user is + * less than `pageSize`. * @return Google_Service_StreetViewPublish_ListPhotosResponse */ public function listPhotos($optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/TPU.php b/vendor/google/apiclient-services/src/Google/Service/TPU.php index 87ebb79..fcb23a6 100644 --- a/vendor/google/apiclient-services/src/Google/Service/TPU.php +++ b/vendor/google/apiclient-services/src/Google/Service/TPU.php @@ -322,10 +322,6 @@ class Google_Service_TPU extends Google_Service 'type' => 'string', 'required' => true, ), - 'filter' => array( - 'location' => 'query', - 'type' => 'string', - ), 'pageToken' => array( 'location' => 'query', 'type' => 'string', @@ -338,6 +334,10 @@ class Google_Service_TPU extends Google_Service 'location' => 'query', 'type' => 'integer', ), + 'filter' => array( + 'location' => 'query', + 'type' => 'string', + ), ), ), ) diff --git a/vendor/google/apiclient-services/src/Google/Service/TPU/ListAcceleratorTypesResponse.php b/vendor/google/apiclient-services/src/Google/Service/TPU/ListAcceleratorTypesResponse.php index f40de33..6bf18a2 100644 --- a/vendor/google/apiclient-services/src/Google/Service/TPU/ListAcceleratorTypesResponse.php +++ b/vendor/google/apiclient-services/src/Google/Service/TPU/ListAcceleratorTypesResponse.php @@ -17,10 +17,11 @@ class Google_Service_TPU_ListAcceleratorTypesResponse extends Google_Collection { - protected $collection_key = 'acceleratorTypes'; + protected $collection_key = 'unreachable'; protected $acceleratorTypesType = 'Google_Service_TPU_AcceleratorType'; protected $acceleratorTypesDataType = 'array'; public $nextPageToken; + public $unreachable; /** * @param Google_Service_TPU_AcceleratorType @@ -44,4 +45,12 @@ class Google_Service_TPU_ListAcceleratorTypesResponse extends Google_Collection { return $this->nextPageToken; } + public function setUnreachable($unreachable) + { + $this->unreachable = $unreachable; + } + public function getUnreachable() + { + return $this->unreachable; + } } diff --git a/vendor/google/apiclient-services/src/Google/Service/TPU/ListTensorFlowVersionsResponse.php b/vendor/google/apiclient-services/src/Google/Service/TPU/ListTensorFlowVersionsResponse.php index 46b7861..02e8145 100644 --- a/vendor/google/apiclient-services/src/Google/Service/TPU/ListTensorFlowVersionsResponse.php +++ b/vendor/google/apiclient-services/src/Google/Service/TPU/ListTensorFlowVersionsResponse.php @@ -17,10 +17,11 @@ class Google_Service_TPU_ListTensorFlowVersionsResponse extends Google_Collection { - protected $collection_key = 'tensorflowVersions'; + protected $collection_key = 'unreachable'; public $nextPageToken; protected $tensorflowVersionsType = 'Google_Service_TPU_TensorFlowVersion'; protected $tensorflowVersionsDataType = 'array'; + public $unreachable; public function setNextPageToken($nextPageToken) { @@ -44,4 +45,12 @@ class Google_Service_TPU_ListTensorFlowVersionsResponse extends Google_Collectio { return $this->tensorflowVersions; } + public function setUnreachable($unreachable) + { + $this->unreachable = $unreachable; + } + public function getUnreachable() + { + return $this->unreachable; + } } diff --git a/vendor/google/apiclient-services/src/Google/Service/TPU/Resource/ProjectsLocationsTensorflowVersions.php b/vendor/google/apiclient-services/src/Google/Service/TPU/Resource/ProjectsLocationsTensorflowVersions.php index 333afdb..12ad2b1 100644 --- a/vendor/google/apiclient-services/src/Google/Service/TPU/Resource/ProjectsLocationsTensorflowVersions.php +++ b/vendor/google/apiclient-services/src/Google/Service/TPU/Resource/ProjectsLocationsTensorflowVersions.php @@ -45,11 +45,11 @@ class Google_Service_TPU_Resource_ProjectsLocationsTensorflowVersions extends Go * @param string $parent The parent resource name. * @param array $optParams Optional parameters. * - * @opt_param string filter List filter. * @opt_param string pageToken The next_page_token value returned from a * previous List request, if any. * @opt_param string orderBy Sort results. * @opt_param int pageSize The maximum number of items to return. + * @opt_param string filter List filter. * @return Google_Service_TPU_ListTensorFlowVersionsResponse */ public function listProjectsLocationsTensorflowVersions($parent, $optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Testing/IosModel.php b/vendor/google/apiclient-services/src/Google/Service/Testing/IosModel.php index 771bdfb..cf777f1 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Testing/IosModel.php +++ b/vendor/google/apiclient-services/src/Google/Service/Testing/IosModel.php @@ -22,6 +22,9 @@ class Google_Service_Testing_IosModel extends Google_Collection public $formFactor; public $id; public $name; + public $screenDensity; + public $screenX; + public $screenY; public $supportedVersionIds; public $tags; @@ -57,6 +60,30 @@ class Google_Service_Testing_IosModel extends Google_Collection { return $this->name; } + public function setScreenDensity($screenDensity) + { + $this->screenDensity = $screenDensity; + } + public function getScreenDensity() + { + return $this->screenDensity; + } + public function setScreenX($screenX) + { + $this->screenX = $screenX; + } + public function getScreenX() + { + return $this->screenX; + } + public function setScreenY($screenY) + { + $this->screenY = $screenY; + } + public function getScreenY() + { + return $this->screenY; + } public function setSupportedVersionIds($supportedVersionIds) { $this->supportedVersionIds = $supportedVersionIds; diff --git a/vendor/google/apiclient-services/src/Google/Service/Testing/IosTestLoop.php b/vendor/google/apiclient-services/src/Google/Service/Testing/IosTestLoop.php new file mode 100644 index 0000000..a24c855 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Testing/IosTestLoop.php @@ -0,0 +1,56 @@ +appBundleId = $appBundleId; + } + public function getAppBundleId() + { + return $this->appBundleId; + } + /** + * @param Google_Service_Testing_FileReference + */ + public function setAppIpa(Google_Service_Testing_FileReference $appIpa) + { + $this->appIpa = $appIpa; + } + /** + * @return Google_Service_Testing_FileReference + */ + public function getAppIpa() + { + return $this->appIpa; + } + public function setScenarios($scenarios) + { + $this->scenarios = $scenarios; + } + public function getScenarios() + { + return $this->scenarios; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Testing/TestSpecification.php b/vendor/google/apiclient-services/src/Google/Service/Testing/TestSpecification.php index 74ef652..0b0a46c 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Testing/TestSpecification.php +++ b/vendor/google/apiclient-services/src/Google/Service/Testing/TestSpecification.php @@ -25,6 +25,8 @@ class Google_Service_Testing_TestSpecification extends Google_Model protected $androidTestLoopDataType = ''; public $disablePerformanceMetrics; public $disableVideoRecording; + protected $iosTestLoopType = 'Google_Service_Testing_IosTestLoop'; + protected $iosTestLoopDataType = ''; protected $iosTestSetupType = 'Google_Service_Testing_IosTestSetup'; protected $iosTestSetupDataType = ''; protected $iosXcTestType = 'Google_Service_Testing_IosXcTest'; @@ -91,6 +93,20 @@ class Google_Service_Testing_TestSpecification extends Google_Model { return $this->disableVideoRecording; } + /** + * @param Google_Service_Testing_IosTestLoop + */ + public function setIosTestLoop(Google_Service_Testing_IosTestLoop $iosTestLoop) + { + $this->iosTestLoop = $iosTestLoop; + } + /** + * @return Google_Service_Testing_IosTestLoop + */ + public function getIosTestLoop() + { + return $this->iosTestLoop; + } /** * @param Google_Service_Testing_IosTestSetup */ diff --git a/vendor/google/apiclient-services/src/Google/Service/Texttospeech/Resource/Voices.php b/vendor/google/apiclient-services/src/Google/Service/Texttospeech/Resource/Voices.php index e412641..aec1f37 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Texttospeech/Resource/Voices.php +++ b/vendor/google/apiclient-services/src/Google/Service/Texttospeech/Resource/Voices.php @@ -30,14 +30,13 @@ class Google_Service_Texttospeech_Resource_Voices extends Google_Service_Resourc * * @param array $optParams Optional parameters. * - * @opt_param string languageCode Optional (but recommended) - * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag. If - * specified, the ListVoices call will only return voices that can be used to - * synthesize this language_code. E.g. when specifying "en-NZ", you will get - * supported "en-*" voices; when specifying "no", you will get supported "no-*" - * (Norwegian) and "nb-*" (Norwegian Bokmal) voices; specifying "zh" will also - * get supported "cmn-*" voices; specifying "zh-hk" will also get supported - * "yue-*" voices. + * @opt_param string languageCode Optional. Recommended. [BCP-47](https://www + * .rfc-editor.org/rfc/bcp/bcp47.txt) language tag. If specified, the ListVoices + * call will only return voices that can be used to synthesize this + * language_code. E.g. when specifying "en-NZ", you will get supported "en-*" + * voices; when specifying "no", you will get supported "no-*" (Norwegian) and + * "nb-*" (Norwegian Bokmal) voices; specifying "zh" will also get supported + * "cmn-*" voices; specifying "zh-hk" will also get supported "yue-*" voices. * @return Google_Service_Texttospeech_ListVoicesResponse */ public function listVoices($optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Vault.php b/vendor/google/apiclient-services/src/Google/Service/Vault.php index e29715e..9753d79 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vault.php +++ b/vendor/google/apiclient-services/src/Google/Service/Vault.php @@ -42,6 +42,7 @@ class Google_Service_Vault extends Google_Service public $matters_holds; public $matters_holds_accounts; public $matters_savedQueries; + public $operations; /** * Constructs the internal representation of the Vault service. @@ -116,14 +117,6 @@ class Google_Service_Vault extends Google_Service 'path' => 'v1/matters', 'httpMethod' => 'GET', 'parameters' => array( - 'pageToken' => array( - 'location' => 'query', - 'type' => 'string', - ), - 'pageSize' => array( - 'location' => 'query', - 'type' => 'integer', - ), 'view' => array( 'location' => 'query', 'type' => 'string', @@ -132,6 +125,14 @@ class Google_Service_Vault extends Google_Service 'location' => 'query', 'type' => 'string', ), + 'pageToken' => array( + 'location' => 'query', + 'type' => 'string', + ), + 'pageSize' => array( + 'location' => 'query', + 'type' => 'integer', + ), ), ),'removePermissions' => array( 'path' => 'v1/matters/{matterId}:removePermissions', @@ -494,5 +495,25 @@ class Google_Service_Vault extends Google_Service ) ) ); + $this->operations = new Google_Service_Vault_Resource_Operations( + $this, + $this->serviceName, + 'operations', + array( + 'methods' => array( + 'delete' => array( + 'path' => 'v1/{+name}', + 'httpMethod' => 'DELETE', + 'parameters' => array( + 'name' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), + ), + ) + ) + ); } } diff --git a/vendor/google/apiclient-services/src/Google/Service/Vault/Resource/Matters.php b/vendor/google/apiclient-services/src/Google/Service/Vault/Resource/Matters.php index 02ef297..0c6563b 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vault/Resource/Matters.php +++ b/vendor/google/apiclient-services/src/Google/Service/Vault/Resource/Matters.php @@ -104,13 +104,13 @@ class Google_Service_Vault_Resource_Matters extends Google_Service_Resource * * @param array $optParams Optional parameters. * - * @opt_param string pageToken The pagination token as returned in the response. - * @opt_param int pageSize The number of matters to return in the response. - * Default and maximum are 100. * @opt_param string view Specifies which parts of the matter to return in * response. * @opt_param string state If set, list only matters with that specific state. * The default is listing matters of all states. + * @opt_param string pageToken The pagination token as returned in the response. + * @opt_param int pageSize The number of matters to return in the response. + * Default and maximum are 100. * @return Google_Service_Vault_ListMattersResponse */ public function listMatters($optParams = array()) diff --git a/vendor/google/apiclient-services/src/Google/Service/Vault/Resource/Operations.php b/vendor/google/apiclient-services/src/Google/Service/Vault/Resource/Operations.php new file mode 100644 index 0000000..142af01 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Vault/Resource/Operations.php @@ -0,0 +1,44 @@ + + * $vaultService = new Google_Service_Vault(...); + * $operations = $vaultService->operations; + * + */ +class Google_Service_Vault_Resource_Operations extends Google_Service_Resource +{ + /** + * Deletes a long-running operation. This method indicates that the client is no + * longer interested in the operation result. It does not cancel the operation. + * If the server doesn't support this method, it returns + * `google.rpc.Code.UNIMPLEMENTED`. (operations.delete) + * + * @param string $name The name of the operation resource to be deleted. + * @param array $optParams Optional parameters. + * @return Google_Service_Vault_VaultEmpty + */ + public function delete($name, $optParams = array()) + { + $params = array('name' => $name); + $params = array_merge($params, $optParams); + return $this->call('delete', array($params), "Google_Service_Vault_VaultEmpty"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Verifiedaccess.php b/vendor/google/apiclient-services/src/Google/Service/Verifiedaccess.php new file mode 100644 index 0000000..2394ad1 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Verifiedaccess.php @@ -0,0 +1,74 @@ + + * API for Verified Access chrome extension to provide credential verification + * for chrome devices connecting to an enterprise network

+ * + *

+ * For more information about this service, see the API + * Documentation + *

+ * + * @author Google, Inc. + */ +class Google_Service_Verifiedaccess extends Google_Service +{ + /** Verify your enterprise credentials. */ + const VERIFIEDACCESS = + "https://www.googleapis.com/auth/verifiedaccess"; + + public $challenge; + + /** + * Constructs the internal representation of the Verifiedaccess service. + * + * @param Google_Client $client The client used to deliver requests. + * @param string $rootUrl The root URL used for requests to the service. + */ + public function __construct(Google_Client $client, $rootUrl = null) + { + parent::__construct($client); + $this->rootUrl = $rootUrl ?: 'https://verifiedaccess.googleapis.com/'; + $this->servicePath = ''; + $this->batchPath = 'batch'; + $this->version = 'v1'; + $this->serviceName = 'verifiedaccess'; + + $this->challenge = new Google_Service_Verifiedaccess_Resource_Challenge( + $this, + $this->serviceName, + 'challenge', + array( + 'methods' => array( + 'create' => array( + 'path' => 'v1/challenge', + 'httpMethod' => 'POST', + 'parameters' => array(), + ),'verify' => array( + 'path' => 'v1/challenge:verify', + 'httpMethod' => 'POST', + 'parameters' => array(), + ), + ) + ) + ); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Verifiedaccess/Challenge.php b/vendor/google/apiclient-services/src/Google/Service/Verifiedaccess/Challenge.php new file mode 100644 index 0000000..1510d37 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Verifiedaccess/Challenge.php @@ -0,0 +1,53 @@ +alternativeChallenge = $alternativeChallenge; + } + /** + * @return Google_Service_Verifiedaccess_SignedData + */ + public function getAlternativeChallenge() + { + return $this->alternativeChallenge; + } + /** + * @param Google_Service_Verifiedaccess_SignedData + */ + public function setChallenge(Google_Service_Verifiedaccess_SignedData $challenge) + { + $this->challenge = $challenge; + } + /** + * @return Google_Service_Verifiedaccess_SignedData + */ + public function getChallenge() + { + return $this->challenge; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Verifiedaccess/Resource/Challenge.php b/vendor/google/apiclient-services/src/Google/Service/Verifiedaccess/Resource/Challenge.php new file mode 100644 index 0000000..ce694a1 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Verifiedaccess/Resource/Challenge.php @@ -0,0 +1,54 @@ + + * $verifiedaccessService = new Google_Service_Verifiedaccess(...); + * $challenge = $verifiedaccessService->challenge; + * + */ +class Google_Service_Verifiedaccess_Resource_Challenge extends Google_Service_Resource +{ + /** + * CreateChallenge API (challenge.create) + * + * @param Google_Service_Verifiedaccess_VerifiedaccessEmpty $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_Verifiedaccess_Challenge + */ + public function create(Google_Service_Verifiedaccess_VerifiedaccessEmpty $postBody, $optParams = array()) + { + $params = array('postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('create', array($params), "Google_Service_Verifiedaccess_Challenge"); + } + /** + * VerifyChallengeResponse API (challenge.verify) + * + * @param Google_Service_Verifiedaccess_VerifyChallengeResponseRequest $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_Verifiedaccess_VerifyChallengeResponseResult + */ + public function verify(Google_Service_Verifiedaccess_VerifyChallengeResponseRequest $postBody, $optParams = array()) + { + $params = array('postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('verify', array($params), "Google_Service_Verifiedaccess_VerifyChallengeResponseResult"); + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Verifiedaccess/SignedData.php b/vendor/google/apiclient-services/src/Google/Service/Verifiedaccess/SignedData.php new file mode 100644 index 0000000..a8ceaeb --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Verifiedaccess/SignedData.php @@ -0,0 +1,39 @@ +data = $data; + } + public function getData() + { + return $this->data; + } + public function setSignature($signature) + { + $this->signature = $signature; + } + public function getSignature() + { + return $this->signature; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Verifiedaccess/VerifiedaccessEmpty.php b/vendor/google/apiclient-services/src/Google/Service/Verifiedaccess/VerifiedaccessEmpty.php new file mode 100644 index 0000000..5283a46 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Verifiedaccess/VerifiedaccessEmpty.php @@ -0,0 +1,20 @@ +challengeResponse = $challengeResponse; + } + /** + * @return Google_Service_Verifiedaccess_SignedData + */ + public function getChallengeResponse() + { + return $this->challengeResponse; + } + public function setExpectedIdentity($expectedIdentity) + { + $this->expectedIdentity = $expectedIdentity; + } + public function getExpectedIdentity() + { + return $this->expectedIdentity; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Verifiedaccess/VerifyChallengeResponseResult.php b/vendor/google/apiclient-services/src/Google/Service/Verifiedaccess/VerifyChallengeResponseResult.php new file mode 100644 index 0000000..1181e5a --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Verifiedaccess/VerifyChallengeResponseResult.php @@ -0,0 +1,57 @@ +deviceEnrollmentId = $deviceEnrollmentId; + } + public function getDeviceEnrollmentId() + { + return $this->deviceEnrollmentId; + } + public function setDevicePermanentId($devicePermanentId) + { + $this->devicePermanentId = $devicePermanentId; + } + public function getDevicePermanentId() + { + return $this->devicePermanentId; + } + public function setSignedPublicKeyAndChallenge($signedPublicKeyAndChallenge) + { + $this->signedPublicKeyAndChallenge = $signedPublicKeyAndChallenge; + } + public function getSignedPublicKeyAndChallenge() + { + return $this->signedPublicKeyAndChallenge; + } + public function setVerificationOutput($verificationOutput) + { + $this->verificationOutput = $verificationOutput; + } + public function getVerificationOutput() + { + return $this->verificationOutput; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision.php b/vendor/google/apiclient-services/src/Google/Service/Vision.php index 4a9dab6..c7f656b 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision.php +++ b/vendor/google/apiclient-services/src/Google/Service/Vision.php @@ -533,6 +533,16 @@ class Google_Service_Vision extends Google_Service 'type' => 'string', ), ), + ),'purge' => array( + 'path' => 'v1/{+parent}/products:purge', + 'httpMethod' => 'POST', + 'parameters' => array( + 'parent' => array( + 'location' => 'path', + 'type' => 'string', + 'required' => true, + ), + ), ), ) ) diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/AnnotateFileResponse.php b/vendor/google/apiclient-services/src/Google/Service/Vision/AnnotateFileResponse.php index 4026e46..282ad3a 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/AnnotateFileResponse.php +++ b/vendor/google/apiclient-services/src/Google/Service/Vision/AnnotateFileResponse.php @@ -18,12 +18,28 @@ class Google_Service_Vision_AnnotateFileResponse extends Google_Collection { protected $collection_key = 'responses'; + protected $errorType = 'Google_Service_Vision_Status'; + protected $errorDataType = ''; protected $inputConfigType = 'Google_Service_Vision_InputConfig'; protected $inputConfigDataType = ''; protected $responsesType = 'Google_Service_Vision_AnnotateImageResponse'; protected $responsesDataType = 'array'; public $totalPages; + /** + * @param Google_Service_Vision_Status + */ + public function setError(Google_Service_Vision_Status $error) + { + $this->error = $error; + } + /** + * @return Google_Service_Vision_Status + */ + public function getError() + { + return $this->error; + } /** * @param Google_Service_Vision_InputConfig */ diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p1beta1AnnotateFileResponse.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p1beta1AnnotateFileResponse.php index 139db33..c2da0a8 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p1beta1AnnotateFileResponse.php +++ b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p1beta1AnnotateFileResponse.php @@ -18,12 +18,28 @@ class Google_Service_Vision_GoogleCloudVisionV1p1beta1AnnotateFileResponse extends Google_Collection { protected $collection_key = 'responses'; + protected $errorType = 'Google_Service_Vision_Status'; + protected $errorDataType = ''; protected $inputConfigType = 'Google_Service_Vision_GoogleCloudVisionV1p1beta1InputConfig'; protected $inputConfigDataType = ''; protected $responsesType = 'Google_Service_Vision_GoogleCloudVisionV1p1beta1AnnotateImageResponse'; protected $responsesDataType = 'array'; public $totalPages; + /** + * @param Google_Service_Vision_Status + */ + public function setError(Google_Service_Vision_Status $error) + { + $this->error = $error; + } + /** + * @return Google_Service_Vision_Status + */ + public function getError() + { + return $this->error; + } /** * @param Google_Service_Vision_GoogleCloudVisionV1p1beta1InputConfig */ diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p1beta1ProductSearchResultsGroupedResult.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p1beta1ProductSearchResultsGroupedResult.php index 1be8db9..60d0e96 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p1beta1ProductSearchResultsGroupedResult.php +++ b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p1beta1ProductSearchResultsGroupedResult.php @@ -20,6 +20,8 @@ class Google_Service_Vision_GoogleCloudVisionV1p1beta1ProductSearchResultsGroupe protected $collection_key = 'results'; protected $boundingPolyType = 'Google_Service_Vision_GoogleCloudVisionV1p1beta1BoundingPoly'; protected $boundingPolyDataType = ''; + protected $objectAnnotationsType = 'Google_Service_Vision_GoogleCloudVisionV1p1beta1ProductSearchResultsObjectAnnotation'; + protected $objectAnnotationsDataType = 'array'; protected $resultsType = 'Google_Service_Vision_GoogleCloudVisionV1p1beta1ProductSearchResultsResult'; protected $resultsDataType = 'array'; @@ -37,6 +39,20 @@ class Google_Service_Vision_GoogleCloudVisionV1p1beta1ProductSearchResultsGroupe { return $this->boundingPoly; } + /** + * @param Google_Service_Vision_GoogleCloudVisionV1p1beta1ProductSearchResultsObjectAnnotation + */ + public function setObjectAnnotations($objectAnnotations) + { + $this->objectAnnotations = $objectAnnotations; + } + /** + * @return Google_Service_Vision_GoogleCloudVisionV1p1beta1ProductSearchResultsObjectAnnotation + */ + public function getObjectAnnotations() + { + return $this->objectAnnotations; + } /** * @param Google_Service_Vision_GoogleCloudVisionV1p1beta1ProductSearchResultsResult */ diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1LocalizedObjectAnnotation.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p1beta1ProductSearchResultsObjectAnnotation.php similarity index 65% rename from vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1LocalizedObjectAnnotation.php rename to vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p1beta1ProductSearchResultsObjectAnnotation.php index 66f6a56..9c52790 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1LocalizedObjectAnnotation.php +++ b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p1beta1ProductSearchResultsObjectAnnotation.php @@ -15,29 +15,13 @@ * the License. */ -class Google_Service_Vision_GoogleCloudVisionV1p5beta1LocalizedObjectAnnotation extends Google_Model +class Google_Service_Vision_GoogleCloudVisionV1p1beta1ProductSearchResultsObjectAnnotation extends Google_Model { - protected $boundingPolyType = 'Google_Service_Vision_GoogleCloudVisionV1p5beta1BoundingPoly'; - protected $boundingPolyDataType = ''; public $languageCode; public $mid; public $name; public $score; - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1BoundingPoly - */ - public function setBoundingPoly(Google_Service_Vision_GoogleCloudVisionV1p5beta1BoundingPoly $boundingPoly) - { - $this->boundingPoly = $boundingPoly; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1BoundingPoly - */ - public function getBoundingPoly() - { - return $this->boundingPoly; - } public function setLanguageCode($languageCode) { $this->languageCode = $languageCode; diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p2beta1AnnotateFileResponse.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p2beta1AnnotateFileResponse.php index 552f6d1..b9d1dfd 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p2beta1AnnotateFileResponse.php +++ b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p2beta1AnnotateFileResponse.php @@ -18,12 +18,28 @@ class Google_Service_Vision_GoogleCloudVisionV1p2beta1AnnotateFileResponse extends Google_Collection { protected $collection_key = 'responses'; + protected $errorType = 'Google_Service_Vision_Status'; + protected $errorDataType = ''; protected $inputConfigType = 'Google_Service_Vision_GoogleCloudVisionV1p2beta1InputConfig'; protected $inputConfigDataType = ''; protected $responsesType = 'Google_Service_Vision_GoogleCloudVisionV1p2beta1AnnotateImageResponse'; protected $responsesDataType = 'array'; public $totalPages; + /** + * @param Google_Service_Vision_Status + */ + public function setError(Google_Service_Vision_Status $error) + { + $this->error = $error; + } + /** + * @return Google_Service_Vision_Status + */ + public function getError() + { + return $this->error; + } /** * @param Google_Service_Vision_GoogleCloudVisionV1p2beta1InputConfig */ diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p2beta1ProductSearchResultsGroupedResult.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p2beta1ProductSearchResultsGroupedResult.php index 5985da3..1959e8b 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p2beta1ProductSearchResultsGroupedResult.php +++ b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p2beta1ProductSearchResultsGroupedResult.php @@ -20,6 +20,8 @@ class Google_Service_Vision_GoogleCloudVisionV1p2beta1ProductSearchResultsGroupe protected $collection_key = 'results'; protected $boundingPolyType = 'Google_Service_Vision_GoogleCloudVisionV1p2beta1BoundingPoly'; protected $boundingPolyDataType = ''; + protected $objectAnnotationsType = 'Google_Service_Vision_GoogleCloudVisionV1p2beta1ProductSearchResultsObjectAnnotation'; + protected $objectAnnotationsDataType = 'array'; protected $resultsType = 'Google_Service_Vision_GoogleCloudVisionV1p2beta1ProductSearchResultsResult'; protected $resultsDataType = 'array'; @@ -37,6 +39,20 @@ class Google_Service_Vision_GoogleCloudVisionV1p2beta1ProductSearchResultsGroupe { return $this->boundingPoly; } + /** + * @param Google_Service_Vision_GoogleCloudVisionV1p2beta1ProductSearchResultsObjectAnnotation + */ + public function setObjectAnnotations($objectAnnotations) + { + $this->objectAnnotations = $objectAnnotations; + } + /** + * @return Google_Service_Vision_GoogleCloudVisionV1p2beta1ProductSearchResultsObjectAnnotation + */ + public function getObjectAnnotations() + { + return $this->objectAnnotations; + } /** * @param Google_Service_Vision_GoogleCloudVisionV1p2beta1ProductSearchResultsResult */ diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1TextAnnotationDetectedLanguage.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p2beta1ProductSearchResultsObjectAnnotation.php similarity index 61% rename from vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1TextAnnotationDetectedLanguage.php rename to vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p2beta1ProductSearchResultsObjectAnnotation.php index bff421c..2343f7e 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1TextAnnotationDetectedLanguage.php +++ b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p2beta1ProductSearchResultsObjectAnnotation.php @@ -15,19 +15,13 @@ * the License. */ -class Google_Service_Vision_GoogleCloudVisionV1p5beta1TextAnnotationDetectedLanguage extends Google_Model +class Google_Service_Vision_GoogleCloudVisionV1p2beta1ProductSearchResultsObjectAnnotation extends Google_Model { - public $confidence; public $languageCode; + public $mid; + public $name; + public $score; - public function setConfidence($confidence) - { - $this->confidence = $confidence; - } - public function getConfidence() - { - return $this->confidence; - } public function setLanguageCode($languageCode) { $this->languageCode = $languageCode; @@ -36,4 +30,28 @@ class Google_Service_Vision_GoogleCloudVisionV1p5beta1TextAnnotationDetectedLang { return $this->languageCode; } + 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 setScore($score) + { + $this->score = $score; + } + public function getScore() + { + return $this->score; + } } diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p3beta1AnnotateFileResponse.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p3beta1AnnotateFileResponse.php index 8c04b74..92a3152 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p3beta1AnnotateFileResponse.php +++ b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p3beta1AnnotateFileResponse.php @@ -18,12 +18,28 @@ class Google_Service_Vision_GoogleCloudVisionV1p3beta1AnnotateFileResponse extends Google_Collection { protected $collection_key = 'responses'; + protected $errorType = 'Google_Service_Vision_Status'; + protected $errorDataType = ''; protected $inputConfigType = 'Google_Service_Vision_GoogleCloudVisionV1p3beta1InputConfig'; protected $inputConfigDataType = ''; protected $responsesType = 'Google_Service_Vision_GoogleCloudVisionV1p3beta1AnnotateImageResponse'; protected $responsesDataType = 'array'; public $totalPages; + /** + * @param Google_Service_Vision_Status + */ + public function setError(Google_Service_Vision_Status $error) + { + $this->error = $error; + } + /** + * @return Google_Service_Vision_Status + */ + public function getError() + { + return $this->error; + } /** * @param Google_Service_Vision_GoogleCloudVisionV1p3beta1InputConfig */ diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p3beta1ProductSearchResultsGroupedResult.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p3beta1ProductSearchResultsGroupedResult.php index 8c2fd33..b3e02bf 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p3beta1ProductSearchResultsGroupedResult.php +++ b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p3beta1ProductSearchResultsGroupedResult.php @@ -20,6 +20,8 @@ class Google_Service_Vision_GoogleCloudVisionV1p3beta1ProductSearchResultsGroupe protected $collection_key = 'results'; protected $boundingPolyType = 'Google_Service_Vision_GoogleCloudVisionV1p3beta1BoundingPoly'; protected $boundingPolyDataType = ''; + protected $objectAnnotationsType = 'Google_Service_Vision_GoogleCloudVisionV1p3beta1ProductSearchResultsObjectAnnotation'; + protected $objectAnnotationsDataType = 'array'; protected $resultsType = 'Google_Service_Vision_GoogleCloudVisionV1p3beta1ProductSearchResultsResult'; protected $resultsDataType = 'array'; @@ -37,6 +39,20 @@ class Google_Service_Vision_GoogleCloudVisionV1p3beta1ProductSearchResultsGroupe { return $this->boundingPoly; } + /** + * @param Google_Service_Vision_GoogleCloudVisionV1p3beta1ProductSearchResultsObjectAnnotation + */ + public function setObjectAnnotations($objectAnnotations) + { + $this->objectAnnotations = $objectAnnotations; + } + /** + * @return Google_Service_Vision_GoogleCloudVisionV1p3beta1ProductSearchResultsObjectAnnotation + */ + public function getObjectAnnotations() + { + return $this->objectAnnotations; + } /** * @param Google_Service_Vision_GoogleCloudVisionV1p3beta1ProductSearchResultsResult */ diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p3beta1ProductSearchResultsObjectAnnotation.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p3beta1ProductSearchResultsObjectAnnotation.php new file mode 100644 index 0000000..c248df5 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p3beta1ProductSearchResultsObjectAnnotation.php @@ -0,0 +1,57 @@ +languageCode = $languageCode; + } + public function getLanguageCode() + { + return $this->languageCode; + } + 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 setScore($score) + { + $this->score = $score; + } + public function getScore() + { + return $this->score; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p4beta1AnnotateFileResponse.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p4beta1AnnotateFileResponse.php index 1b9ec07..893998d 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p4beta1AnnotateFileResponse.php +++ b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p4beta1AnnotateFileResponse.php @@ -18,12 +18,28 @@ class Google_Service_Vision_GoogleCloudVisionV1p4beta1AnnotateFileResponse extends Google_Collection { protected $collection_key = 'responses'; + protected $errorType = 'Google_Service_Vision_Status'; + protected $errorDataType = ''; protected $inputConfigType = 'Google_Service_Vision_GoogleCloudVisionV1p4beta1InputConfig'; protected $inputConfigDataType = ''; protected $responsesType = 'Google_Service_Vision_GoogleCloudVisionV1p4beta1AnnotateImageResponse'; protected $responsesDataType = 'array'; public $totalPages; + /** + * @param Google_Service_Vision_Status + */ + public function setError(Google_Service_Vision_Status $error) + { + $this->error = $error; + } + /** + * @return Google_Service_Vision_Status + */ + public function getError() + { + return $this->error; + } /** * @param Google_Service_Vision_GoogleCloudVisionV1p4beta1InputConfig */ diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p4beta1AnnotateImageResponse.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p4beta1AnnotateImageResponse.php index 8c1c43d..b528d4b 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p4beta1AnnotateImageResponse.php +++ b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p4beta1AnnotateImageResponse.php @@ -30,8 +30,6 @@ class Google_Service_Vision_GoogleCloudVisionV1p4beta1AnnotateImageResponse exte protected $fullTextAnnotationDataType = ''; protected $imagePropertiesAnnotationType = 'Google_Service_Vision_GoogleCloudVisionV1p4beta1ImageProperties'; protected $imagePropertiesAnnotationDataType = ''; - protected $imageQualityAnnotationType = 'Google_Service_Vision_GoogleCloudVisionV1p4beta1ImageQuality'; - protected $imageQualityAnnotationDataType = ''; protected $labelAnnotationsType = 'Google_Service_Vision_GoogleCloudVisionV1p4beta1EntityAnnotation'; protected $labelAnnotationsDataType = 'array'; protected $landmarkAnnotationsType = 'Google_Service_Vision_GoogleCloudVisionV1p4beta1EntityAnnotation'; @@ -42,8 +40,6 @@ class Google_Service_Vision_GoogleCloudVisionV1p4beta1AnnotateImageResponse exte protected $logoAnnotationsDataType = 'array'; protected $productSearchResultsType = 'Google_Service_Vision_GoogleCloudVisionV1p4beta1ProductSearchResults'; protected $productSearchResultsDataType = ''; - protected $qualityOptimizationResultType = 'Google_Service_Vision_GoogleCloudVisionV1p4beta1QualityOptimizationResult'; - protected $qualityOptimizationResultDataType = ''; protected $safeSearchAnnotationType = 'Google_Service_Vision_GoogleCloudVisionV1p4beta1SafeSearchAnnotation'; protected $safeSearchAnnotationDataType = ''; protected $textAnnotationsType = 'Google_Service_Vision_GoogleCloudVisionV1p4beta1EntityAnnotation'; @@ -135,20 +131,6 @@ class Google_Service_Vision_GoogleCloudVisionV1p4beta1AnnotateImageResponse exte { return $this->imagePropertiesAnnotation; } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p4beta1ImageQuality - */ - public function setImageQualityAnnotation(Google_Service_Vision_GoogleCloudVisionV1p4beta1ImageQuality $imageQualityAnnotation) - { - $this->imageQualityAnnotation = $imageQualityAnnotation; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p4beta1ImageQuality - */ - public function getImageQualityAnnotation() - { - return $this->imageQualityAnnotation; - } /** * @param Google_Service_Vision_GoogleCloudVisionV1p4beta1EntityAnnotation */ @@ -219,20 +201,6 @@ class Google_Service_Vision_GoogleCloudVisionV1p4beta1AnnotateImageResponse exte { return $this->productSearchResults; } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p4beta1QualityOptimizationResult - */ - public function setQualityOptimizationResult(Google_Service_Vision_GoogleCloudVisionV1p4beta1QualityOptimizationResult $qualityOptimizationResult) - { - $this->qualityOptimizationResult = $qualityOptimizationResult; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p4beta1QualityOptimizationResult - */ - public function getQualityOptimizationResult() - { - return $this->qualityOptimizationResult; - } /** * @param Google_Service_Vision_GoogleCloudVisionV1p4beta1SafeSearchAnnotation */ diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p4beta1ImageQuality.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p4beta1ImageQuality.php deleted file mode 100644 index 765f657..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p4beta1ImageQuality.php +++ /dev/null @@ -1,30 +0,0 @@ -qualityScore = $qualityScore; - } - public function getQualityScore() - { - return $this->qualityScore; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p4beta1ProductSearchResultsGroupedResult.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p4beta1ProductSearchResultsGroupedResult.php index 865ae02..18d16b3 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p4beta1ProductSearchResultsGroupedResult.php +++ b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p4beta1ProductSearchResultsGroupedResult.php @@ -20,6 +20,8 @@ class Google_Service_Vision_GoogleCloudVisionV1p4beta1ProductSearchResultsGroupe protected $collection_key = 'results'; protected $boundingPolyType = 'Google_Service_Vision_GoogleCloudVisionV1p4beta1BoundingPoly'; protected $boundingPolyDataType = ''; + protected $objectAnnotationsType = 'Google_Service_Vision_GoogleCloudVisionV1p4beta1ProductSearchResultsObjectAnnotation'; + protected $objectAnnotationsDataType = 'array'; protected $resultsType = 'Google_Service_Vision_GoogleCloudVisionV1p4beta1ProductSearchResultsResult'; protected $resultsDataType = 'array'; @@ -37,6 +39,20 @@ class Google_Service_Vision_GoogleCloudVisionV1p4beta1ProductSearchResultsGroupe { return $this->boundingPoly; } + /** + * @param Google_Service_Vision_GoogleCloudVisionV1p4beta1ProductSearchResultsObjectAnnotation + */ + public function setObjectAnnotations($objectAnnotations) + { + $this->objectAnnotations = $objectAnnotations; + } + /** + * @return Google_Service_Vision_GoogleCloudVisionV1p4beta1ProductSearchResultsObjectAnnotation + */ + public function getObjectAnnotations() + { + return $this->objectAnnotations; + } /** * @param Google_Service_Vision_GoogleCloudVisionV1p4beta1ProductSearchResultsResult */ diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p4beta1ProductSearchResultsObjectAnnotation.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p4beta1ProductSearchResultsObjectAnnotation.php new file mode 100644 index 0000000..2106272 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p4beta1ProductSearchResultsObjectAnnotation.php @@ -0,0 +1,57 @@ +languageCode = $languageCode; + } + public function getLanguageCode() + { + return $this->languageCode; + } + 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 setScore($score) + { + $this->score = $score; + } + public function getScore() + { + return $this->score; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p4beta1SafeSearchAnnotation.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p4beta1SafeSearchAnnotation.php index 68abeda..819aeff 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p4beta1SafeSearchAnnotation.php +++ b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p4beta1SafeSearchAnnotation.php @@ -18,16 +18,10 @@ class Google_Service_Vision_GoogleCloudVisionV1p4beta1SafeSearchAnnotation extends Google_Model { public $adult; - public $adultConfidence; public $medical; - public $medicalConfidence; - public $nsfwConfidence; public $racy; - public $racyConfidence; public $spoof; - public $spoofConfidence; public $violence; - public $violenceConfidence; public function setAdult($adult) { @@ -37,14 +31,6 @@ class Google_Service_Vision_GoogleCloudVisionV1p4beta1SafeSearchAnnotation exten { return $this->adult; } - public function setAdultConfidence($adultConfidence) - { - $this->adultConfidence = $adultConfidence; - } - public function getAdultConfidence() - { - return $this->adultConfidence; - } public function setMedical($medical) { $this->medical = $medical; @@ -53,22 +39,6 @@ class Google_Service_Vision_GoogleCloudVisionV1p4beta1SafeSearchAnnotation exten { return $this->medical; } - public function setMedicalConfidence($medicalConfidence) - { - $this->medicalConfidence = $medicalConfidence; - } - public function getMedicalConfidence() - { - return $this->medicalConfidence; - } - public function setNsfwConfidence($nsfwConfidence) - { - $this->nsfwConfidence = $nsfwConfidence; - } - public function getNsfwConfidence() - { - return $this->nsfwConfidence; - } public function setRacy($racy) { $this->racy = $racy; @@ -77,14 +47,6 @@ class Google_Service_Vision_GoogleCloudVisionV1p4beta1SafeSearchAnnotation exten { return $this->racy; } - public function setRacyConfidence($racyConfidence) - { - $this->racyConfidence = $racyConfidence; - } - public function getRacyConfidence() - { - return $this->racyConfidence; - } public function setSpoof($spoof) { $this->spoof = $spoof; @@ -93,14 +55,6 @@ class Google_Service_Vision_GoogleCloudVisionV1p4beta1SafeSearchAnnotation exten { return $this->spoof; } - public function setSpoofConfidence($spoofConfidence) - { - $this->spoofConfidence = $spoofConfidence; - } - public function getSpoofConfidence() - { - return $this->spoofConfidence; - } public function setViolence($violence) { $this->violence = $violence; @@ -109,12 +63,4 @@ class Google_Service_Vision_GoogleCloudVisionV1p4beta1SafeSearchAnnotation exten { return $this->violence; } - public function setViolenceConfidence($violenceConfidence) - { - $this->violenceConfidence = $violenceConfidence; - } - public function getViolenceConfidence() - { - return $this->violenceConfidence; - } } diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1AnnotateFileResponse.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1AnnotateFileResponse.php deleted file mode 100644 index 0d053c8..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1AnnotateFileResponse.php +++ /dev/null @@ -1,63 +0,0 @@ -inputConfig = $inputConfig; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1InputConfig - */ - public function getInputConfig() - { - return $this->inputConfig; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1AnnotateImageResponse - */ - public function setResponses($responses) - { - $this->responses = $responses; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1AnnotateImageResponse - */ - public function getResponses() - { - return $this->responses; - } - public function setTotalPages($totalPages) - { - $this->totalPages = $totalPages; - } - public function getTotalPages() - { - return $this->totalPages; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1AnnotateImageResponse.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1AnnotateImageResponse.php deleted file mode 100644 index 4b8b3a5..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1AnnotateImageResponse.php +++ /dev/null @@ -1,246 +0,0 @@ -context = $context; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1ImageAnnotationContext - */ - public function getContext() - { - return $this->context; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1CropHintsAnnotation - */ - public function setCropHintsAnnotation(Google_Service_Vision_GoogleCloudVisionV1p5beta1CropHintsAnnotation $cropHintsAnnotation) - { - $this->cropHintsAnnotation = $cropHintsAnnotation; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1CropHintsAnnotation - */ - public function getCropHintsAnnotation() - { - return $this->cropHintsAnnotation; - } - /** - * @param Google_Service_Vision_Status - */ - public function setError(Google_Service_Vision_Status $error) - { - $this->error = $error; - } - /** - * @return Google_Service_Vision_Status - */ - public function getError() - { - return $this->error; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1FaceAnnotation - */ - public function setFaceAnnotations($faceAnnotations) - { - $this->faceAnnotations = $faceAnnotations; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1FaceAnnotation - */ - public function getFaceAnnotations() - { - return $this->faceAnnotations; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1TextAnnotation - */ - public function setFullTextAnnotation(Google_Service_Vision_GoogleCloudVisionV1p5beta1TextAnnotation $fullTextAnnotation) - { - $this->fullTextAnnotation = $fullTextAnnotation; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1TextAnnotation - */ - public function getFullTextAnnotation() - { - return $this->fullTextAnnotation; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1ImageProperties - */ - public function setImagePropertiesAnnotation(Google_Service_Vision_GoogleCloudVisionV1p5beta1ImageProperties $imagePropertiesAnnotation) - { - $this->imagePropertiesAnnotation = $imagePropertiesAnnotation; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1ImageProperties - */ - public function getImagePropertiesAnnotation() - { - return $this->imagePropertiesAnnotation; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1EntityAnnotation - */ - public function setLabelAnnotations($labelAnnotations) - { - $this->labelAnnotations = $labelAnnotations; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1EntityAnnotation - */ - public function getLabelAnnotations() - { - return $this->labelAnnotations; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1EntityAnnotation - */ - public function setLandmarkAnnotations($landmarkAnnotations) - { - $this->landmarkAnnotations = $landmarkAnnotations; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1EntityAnnotation - */ - public function getLandmarkAnnotations() - { - return $this->landmarkAnnotations; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1LocalizedObjectAnnotation - */ - public function setLocalizedObjectAnnotations($localizedObjectAnnotations) - { - $this->localizedObjectAnnotations = $localizedObjectAnnotations; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1LocalizedObjectAnnotation - */ - public function getLocalizedObjectAnnotations() - { - return $this->localizedObjectAnnotations; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1EntityAnnotation - */ - public function setLogoAnnotations($logoAnnotations) - { - $this->logoAnnotations = $logoAnnotations; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1EntityAnnotation - */ - public function getLogoAnnotations() - { - return $this->logoAnnotations; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1ProductSearchResults - */ - public function setProductSearchResults(Google_Service_Vision_GoogleCloudVisionV1p5beta1ProductSearchResults $productSearchResults) - { - $this->productSearchResults = $productSearchResults; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1ProductSearchResults - */ - public function getProductSearchResults() - { - return $this->productSearchResults; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1SafeSearchAnnotation - */ - public function setSafeSearchAnnotation(Google_Service_Vision_GoogleCloudVisionV1p5beta1SafeSearchAnnotation $safeSearchAnnotation) - { - $this->safeSearchAnnotation = $safeSearchAnnotation; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1SafeSearchAnnotation - */ - public function getSafeSearchAnnotation() - { - return $this->safeSearchAnnotation; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1EntityAnnotation - */ - public function setTextAnnotations($textAnnotations) - { - $this->textAnnotations = $textAnnotations; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1EntityAnnotation - */ - public function getTextAnnotations() - { - return $this->textAnnotations; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1WebDetection - */ - public function setWebDetection(Google_Service_Vision_GoogleCloudVisionV1p5beta1WebDetection $webDetection) - { - $this->webDetection = $webDetection; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1WebDetection - */ - public function getWebDetection() - { - return $this->webDetection; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1AsyncAnnotateFileResponse.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1AsyncAnnotateFileResponse.php deleted file mode 100644 index f030d87..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1AsyncAnnotateFileResponse.php +++ /dev/null @@ -1,37 +0,0 @@ -outputConfig = $outputConfig; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1OutputConfig - */ - public function getOutputConfig() - { - return $this->outputConfig; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1AsyncBatchAnnotateFilesResponse.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1AsyncBatchAnnotateFilesResponse.php deleted file mode 100644 index 7575233..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1AsyncBatchAnnotateFilesResponse.php +++ /dev/null @@ -1,38 +0,0 @@ -responses = $responses; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1AsyncAnnotateFileResponse - */ - public function getResponses() - { - return $this->responses; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1AsyncBatchAnnotateImagesResponse.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1AsyncBatchAnnotateImagesResponse.php deleted file mode 100644 index 75550ff..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1AsyncBatchAnnotateImagesResponse.php +++ /dev/null @@ -1,37 +0,0 @@ -outputConfig = $outputConfig; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1OutputConfig - */ - public function getOutputConfig() - { - return $this->outputConfig; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1BatchAnnotateFilesResponse.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1BatchAnnotateFilesResponse.php deleted file mode 100644 index ac93b45..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1BatchAnnotateFilesResponse.php +++ /dev/null @@ -1,38 +0,0 @@ -responses = $responses; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1AnnotateFileResponse - */ - public function getResponses() - { - return $this->responses; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1Block.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1Block.php deleted file mode 100644 index ce1bece..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1Block.php +++ /dev/null @@ -1,129 +0,0 @@ -blockType = $blockType; - } - public function getBlockType() - { - return $this->blockType; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1BoundingPoly - */ - public function setBoundingBox(Google_Service_Vision_GoogleCloudVisionV1p5beta1BoundingPoly $boundingBox) - { - $this->boundingBox = $boundingBox; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1BoundingPoly - */ - public function getBoundingBox() - { - return $this->boundingBox; - } - public function setConfidence($confidence) - { - $this->confidence = $confidence; - } - public function getConfidence() - { - return $this->confidence; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1KeyValuePair - */ - public function setKeyValuePair(Google_Service_Vision_GoogleCloudVisionV1p5beta1KeyValuePair $keyValuePair) - { - $this->keyValuePair = $keyValuePair; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1KeyValuePair - */ - public function getKeyValuePair() - { - return $this->keyValuePair; - } - public function setMergedText($mergedText) - { - $this->mergedText = $mergedText; - } - public function getMergedText() - { - return $this->mergedText; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1Paragraph - */ - public function setParagraphs($paragraphs) - { - $this->paragraphs = $paragraphs; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1Paragraph - */ - public function getParagraphs() - { - return $this->paragraphs; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1TextAnnotationTextProperty - */ - public function setProperty(Google_Service_Vision_GoogleCloudVisionV1p5beta1TextAnnotationTextProperty $property) - { - $this->property = $property; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1TextAnnotationTextProperty - */ - public function getProperty() - { - return $this->property; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1Table - */ - public function setTable(Google_Service_Vision_GoogleCloudVisionV1p5beta1Table $table) - { - $this->table = $table; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1Table - */ - public function getTable() - { - return $this->table; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1BoundingPoly.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1BoundingPoly.php deleted file mode 100644 index 53f35d4..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1BoundingPoly.php +++ /dev/null @@ -1,54 +0,0 @@ -normalizedVertices = $normalizedVertices; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1NormalizedVertex - */ - public function getNormalizedVertices() - { - return $this->normalizedVertices; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1Vertex - */ - public function setVertices($vertices) - { - $this->vertices = $vertices; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1Vertex - */ - public function getVertices() - { - return $this->vertices; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1CropHint.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1CropHint.php deleted file mode 100644 index 836270f..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1CropHint.php +++ /dev/null @@ -1,55 +0,0 @@ -boundingPoly = $boundingPoly; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1BoundingPoly - */ - public function getBoundingPoly() - { - return $this->boundingPoly; - } - public function setConfidence($confidence) - { - $this->confidence = $confidence; - } - public function getConfidence() - { - return $this->confidence; - } - public function setImportanceFraction($importanceFraction) - { - $this->importanceFraction = $importanceFraction; - } - public function getImportanceFraction() - { - return $this->importanceFraction; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1CropHintsAnnotation.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1CropHintsAnnotation.php deleted file mode 100644 index 4b1aafe..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1CropHintsAnnotation.php +++ /dev/null @@ -1,38 +0,0 @@ -cropHints = $cropHints; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1CropHint - */ - public function getCropHints() - { - return $this->cropHints; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1DominantColorsAnnotation.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1DominantColorsAnnotation.php deleted file mode 100644 index 0900a79..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1DominantColorsAnnotation.php +++ /dev/null @@ -1,38 +0,0 @@ -colors = $colors; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1ColorInfo - */ - public function getColors() - { - return $this->colors; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1EntityAnnotation.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1EntityAnnotation.php deleted file mode 100644 index 6728acd..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1EntityAnnotation.php +++ /dev/null @@ -1,124 +0,0 @@ -boundingPoly = $boundingPoly; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1BoundingPoly - */ - public function getBoundingPoly() - { - return $this->boundingPoly; - } - public function setConfidence($confidence) - { - $this->confidence = $confidence; - } - public function getConfidence() - { - return $this->confidence; - } - public function setDescription($description) - { - $this->description = $description; - } - public function getDescription() - { - return $this->description; - } - public function setLocale($locale) - { - $this->locale = $locale; - } - public function getLocale() - { - return $this->locale; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1LocationInfo - */ - public function setLocations($locations) - { - $this->locations = $locations; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1LocationInfo - */ - public function getLocations() - { - return $this->locations; - } - public function setMid($mid) - { - $this->mid = $mid; - } - public function getMid() - { - return $this->mid; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1Property - */ - public function setProperties($properties) - { - $this->properties = $properties; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1Property - */ - public function getProperties() - { - return $this->properties; - } - public function setScore($score) - { - $this->score = $score; - } - public function getScore() - { - return $this->score; - } - public function setTopicality($topicality) - { - $this->topicality = $topicality; - } - public function getTopicality() - { - return $this->topicality; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1FaceAnnotation.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1FaceAnnotation.php deleted file mode 100644 index 4ccf9de..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1FaceAnnotation.php +++ /dev/null @@ -1,178 +0,0 @@ -angerLikelihood = $angerLikelihood; - } - public function getAngerLikelihood() - { - return $this->angerLikelihood; - } - public function setBlurredLikelihood($blurredLikelihood) - { - $this->blurredLikelihood = $blurredLikelihood; - } - public function getBlurredLikelihood() - { - return $this->blurredLikelihood; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1BoundingPoly - */ - public function setBoundingPoly(Google_Service_Vision_GoogleCloudVisionV1p5beta1BoundingPoly $boundingPoly) - { - $this->boundingPoly = $boundingPoly; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1BoundingPoly - */ - public function getBoundingPoly() - { - return $this->boundingPoly; - } - public function setDetectionConfidence($detectionConfidence) - { - $this->detectionConfidence = $detectionConfidence; - } - public function getDetectionConfidence() - { - return $this->detectionConfidence; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1BoundingPoly - */ - public function setFdBoundingPoly(Google_Service_Vision_GoogleCloudVisionV1p5beta1BoundingPoly $fdBoundingPoly) - { - $this->fdBoundingPoly = $fdBoundingPoly; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1BoundingPoly - */ - public function getFdBoundingPoly() - { - return $this->fdBoundingPoly; - } - public function setHeadwearLikelihood($headwearLikelihood) - { - $this->headwearLikelihood = $headwearLikelihood; - } - public function getHeadwearLikelihood() - { - return $this->headwearLikelihood; - } - public function setJoyLikelihood($joyLikelihood) - { - $this->joyLikelihood = $joyLikelihood; - } - public function getJoyLikelihood() - { - return $this->joyLikelihood; - } - public function setLandmarkingConfidence($landmarkingConfidence) - { - $this->landmarkingConfidence = $landmarkingConfidence; - } - public function getLandmarkingConfidence() - { - return $this->landmarkingConfidence; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1FaceAnnotationLandmark - */ - public function setLandmarks($landmarks) - { - $this->landmarks = $landmarks; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1FaceAnnotationLandmark - */ - public function getLandmarks() - { - return $this->landmarks; - } - public function setPanAngle($panAngle) - { - $this->panAngle = $panAngle; - } - public function getPanAngle() - { - return $this->panAngle; - } - public function setRollAngle($rollAngle) - { - $this->rollAngle = $rollAngle; - } - public function getRollAngle() - { - return $this->rollAngle; - } - public function setSorrowLikelihood($sorrowLikelihood) - { - $this->sorrowLikelihood = $sorrowLikelihood; - } - public function getSorrowLikelihood() - { - return $this->sorrowLikelihood; - } - public function setSurpriseLikelihood($surpriseLikelihood) - { - $this->surpriseLikelihood = $surpriseLikelihood; - } - public function getSurpriseLikelihood() - { - return $this->surpriseLikelihood; - } - public function setTiltAngle($tiltAngle) - { - $this->tiltAngle = $tiltAngle; - } - public function getTiltAngle() - { - return $this->tiltAngle; - } - public function setUnderExposedLikelihood($underExposedLikelihood) - { - $this->underExposedLikelihood = $underExposedLikelihood; - } - public function getUnderExposedLikelihood() - { - return $this->underExposedLikelihood; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1ImageProperties.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1ImageProperties.php deleted file mode 100644 index 69a9e0c..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1ImageProperties.php +++ /dev/null @@ -1,37 +0,0 @@ -dominantColors = $dominantColors; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1DominantColorsAnnotation - */ - public function getDominantColors() - { - return $this->dominantColors; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1ImportProductSetsResponse.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1ImportProductSetsResponse.php deleted file mode 100644 index 49064a8..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1ImportProductSetsResponse.php +++ /dev/null @@ -1,54 +0,0 @@ -referenceImages = $referenceImages; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1ReferenceImage - */ - public function getReferenceImages() - { - return $this->referenceImages; - } - /** - * @param Google_Service_Vision_Status - */ - public function setStatuses($statuses) - { - $this->statuses = $statuses; - } - /** - * @return Google_Service_Vision_Status - */ - public function getStatuses() - { - return $this->statuses; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1InputConfig.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1InputConfig.php deleted file mode 100644 index 3d03e85..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1InputConfig.php +++ /dev/null @@ -1,55 +0,0 @@ -content = $content; - } - public function getContent() - { - return $this->content; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1GcsSource - */ - public function setGcsSource(Google_Service_Vision_GoogleCloudVisionV1p5beta1GcsSource $gcsSource) - { - $this->gcsSource = $gcsSource; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1GcsSource - */ - public function getGcsSource() - { - return $this->gcsSource; - } - public function setMimeType($mimeType) - { - $this->mimeType = $mimeType; - } - public function getMimeType() - { - return $this->mimeType; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1KeyValuePair.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1KeyValuePair.php deleted file mode 100644 index 1ca2084..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1KeyValuePair.php +++ /dev/null @@ -1,80 +0,0 @@ -key = $key; - } - public function getKey() - { - return $this->key; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1Block - */ - public function setKeyBlock(Google_Service_Vision_GoogleCloudVisionV1p5beta1Block $keyBlock) - { - $this->keyBlock = $keyBlock; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1Block - */ - public function getKeyBlock() - { - return $this->keyBlock; - } - public function setNormalizedKey($normalizedKey) - { - $this->normalizedKey = $normalizedKey; - } - public function getNormalizedKey() - { - return $this->normalizedKey; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1Block - */ - public function setValueBlock(Google_Service_Vision_GoogleCloudVisionV1p5beta1Block $valueBlock) - { - $this->valueBlock = $valueBlock; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1Block - */ - public function getValueBlock() - { - return $this->valueBlock; - } - public function setValueType($valueType) - { - $this->valueType = $valueType; - } - public function getValueType() - { - return $this->valueType; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1OutputConfig.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1OutputConfig.php deleted file mode 100644 index 61e57b8..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1OutputConfig.php +++ /dev/null @@ -1,46 +0,0 @@ -batchSize = $batchSize; - } - public function getBatchSize() - { - return $this->batchSize; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1GcsDestination - */ - public function setGcsDestination(Google_Service_Vision_GoogleCloudVisionV1p5beta1GcsDestination $gcsDestination) - { - $this->gcsDestination = $gcsDestination; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1GcsDestination - */ - public function getGcsDestination() - { - return $this->gcsDestination; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1Page.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1Page.php deleted file mode 100644 index 475f249..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1Page.php +++ /dev/null @@ -1,90 +0,0 @@ -blocks = $blocks; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1Block - */ - public function getBlocks() - { - return $this->blocks; - } - public function setConfidence($confidence) - { - $this->confidence = $confidence; - } - public function getConfidence() - { - return $this->confidence; - } - public function setHeight($height) - { - $this->height = $height; - } - public function getHeight() - { - return $this->height; - } - public function setMergedText($mergedText) - { - $this->mergedText = $mergedText; - } - public function getMergedText() - { - return $this->mergedText; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1TextAnnotationTextProperty - */ - public function setProperty(Google_Service_Vision_GoogleCloudVisionV1p5beta1TextAnnotationTextProperty $property) - { - $this->property = $property; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1TextAnnotationTextProperty - */ - public function getProperty() - { - return $this->property; - } - public function setWidth($width) - { - $this->width = $width; - } - public function getWidth() - { - return $this->width; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1Paragraph.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1Paragraph.php deleted file mode 100644 index d5b72a8..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1Paragraph.php +++ /dev/null @@ -1,88 +0,0 @@ -boundingBox = $boundingBox; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1BoundingPoly - */ - public function getBoundingBox() - { - return $this->boundingBox; - } - public function setConfidence($confidence) - { - $this->confidence = $confidence; - } - public function getConfidence() - { - return $this->confidence; - } - public function setMergedText($mergedText) - { - $this->mergedText = $mergedText; - } - public function getMergedText() - { - return $this->mergedText; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1TextAnnotationTextProperty - */ - public function setProperty(Google_Service_Vision_GoogleCloudVisionV1p5beta1TextAnnotationTextProperty $property) - { - $this->property = $property; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1TextAnnotationTextProperty - */ - public function getProperty() - { - return $this->property; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1Word - */ - public function setWords($words) - { - $this->words = $words; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1Word - */ - public function getWords() - { - return $this->words; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1Product.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1Product.php deleted file mode 100644 index c53d466..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1Product.php +++ /dev/null @@ -1,74 +0,0 @@ -description = $description; - } - public function getDescription() - { - return $this->description; - } - public function setDisplayName($displayName) - { - $this->displayName = $displayName; - } - public function getDisplayName() - { - return $this->displayName; - } - public function setName($name) - { - $this->name = $name; - } - public function getName() - { - return $this->name; - } - public function setProductCategory($productCategory) - { - $this->productCategory = $productCategory; - } - public function getProductCategory() - { - return $this->productCategory; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1ProductKeyValue - */ - public function setProductLabels($productLabels) - { - $this->productLabels = $productLabels; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1ProductKeyValue - */ - public function getProductLabels() - { - return $this->productLabels; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1ProductSearchResults.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1ProductSearchResults.php deleted file mode 100644 index 20544ea..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1ProductSearchResults.php +++ /dev/null @@ -1,63 +0,0 @@ -indexTime = $indexTime; - } - public function getIndexTime() - { - return $this->indexTime; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1ProductSearchResultsGroupedResult - */ - public function setProductGroupedResults($productGroupedResults) - { - $this->productGroupedResults = $productGroupedResults; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1ProductSearchResultsGroupedResult - */ - public function getProductGroupedResults() - { - return $this->productGroupedResults; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1ProductSearchResultsResult - */ - public function setResults($results) - { - $this->results = $results; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1ProductSearchResultsResult - */ - public function getResults() - { - return $this->results; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1ProductSearchResultsGroupedResult.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1ProductSearchResultsGroupedResult.php deleted file mode 100644 index c9837f7..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1ProductSearchResultsGroupedResult.php +++ /dev/null @@ -1,54 +0,0 @@ -boundingPoly = $boundingPoly; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1BoundingPoly - */ - public function getBoundingPoly() - { - return $this->boundingPoly; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1ProductSearchResultsResult - */ - public function setResults($results) - { - $this->results = $results; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1ProductSearchResultsResult - */ - public function getResults() - { - return $this->results; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1ProductSearchResultsResult.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1ProductSearchResultsResult.php deleted file mode 100644 index 23ab4b0..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1ProductSearchResultsResult.php +++ /dev/null @@ -1,55 +0,0 @@ -image = $image; - } - public function getImage() - { - return $this->image; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1Product - */ - public function setProduct(Google_Service_Vision_GoogleCloudVisionV1p5beta1Product $product) - { - $this->product = $product; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1Product - */ - public function getProduct() - { - return $this->product; - } - public function setScore($score) - { - $this->score = $score; - } - public function getScore() - { - return $this->score; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1SafeSearchAnnotation.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1SafeSearchAnnotation.php deleted file mode 100644 index 15ba098..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1SafeSearchAnnotation.php +++ /dev/null @@ -1,120 +0,0 @@ -adult = $adult; - } - public function getAdult() - { - return $this->adult; - } - public function setAdultConfidence($adultConfidence) - { - $this->adultConfidence = $adultConfidence; - } - public function getAdultConfidence() - { - return $this->adultConfidence; - } - public function setMedical($medical) - { - $this->medical = $medical; - } - public function getMedical() - { - return $this->medical; - } - public function setMedicalConfidence($medicalConfidence) - { - $this->medicalConfidence = $medicalConfidence; - } - public function getMedicalConfidence() - { - return $this->medicalConfidence; - } - public function setNsfwConfidence($nsfwConfidence) - { - $this->nsfwConfidence = $nsfwConfidence; - } - public function getNsfwConfidence() - { - return $this->nsfwConfidence; - } - public function setRacy($racy) - { - $this->racy = $racy; - } - public function getRacy() - { - return $this->racy; - } - public function setRacyConfidence($racyConfidence) - { - $this->racyConfidence = $racyConfidence; - } - public function getRacyConfidence() - { - return $this->racyConfidence; - } - public function setSpoof($spoof) - { - $this->spoof = $spoof; - } - public function getSpoof() - { - return $this->spoof; - } - public function setSpoofConfidence($spoofConfidence) - { - $this->spoofConfidence = $spoofConfidence; - } - public function getSpoofConfidence() - { - return $this->spoofConfidence; - } - public function setViolence($violence) - { - $this->violence = $violence; - } - public function getViolence() - { - return $this->violence; - } - public function setViolenceConfidence($violenceConfidence) - { - $this->violenceConfidence = $violenceConfidence; - } - public function getViolenceConfidence() - { - return $this->violenceConfidence; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1Symbol.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1Symbol.php deleted file mode 100644 index dbe9080..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1Symbol.php +++ /dev/null @@ -1,71 +0,0 @@ -boundingBox = $boundingBox; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1BoundingPoly - */ - public function getBoundingBox() - { - return $this->boundingBox; - } - public function setConfidence($confidence) - { - $this->confidence = $confidence; - } - public function getConfidence() - { - return $this->confidence; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1TextAnnotationTextProperty - */ - public function setProperty(Google_Service_Vision_GoogleCloudVisionV1p5beta1TextAnnotationTextProperty $property) - { - $this->property = $property; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1TextAnnotationTextProperty - */ - public function getProperty() - { - return $this->property; - } - public function setText($text) - { - $this->text = $text; - } - public function getText() - { - return $this->text; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1Table.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1Table.php deleted file mode 100644 index c7fac21..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1Table.php +++ /dev/null @@ -1,54 +0,0 @@ -bodyRows = $bodyRows; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1TableTableRow - */ - public function getBodyRows() - { - return $this->bodyRows; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1TableTableRow - */ - public function setHeaderRows($headerRows) - { - $this->headerRows = $headerRows; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1TableTableRow - */ - public function getHeaderRows() - { - return $this->headerRows; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1TableTableCell.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1TableTableCell.php deleted file mode 100644 index 7d7e6fe..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1TableTableCell.php +++ /dev/null @@ -1,64 +0,0 @@ -colSpan = $colSpan; - } - public function getColSpan() - { - return $this->colSpan; - } - public function setRowSpan($rowSpan) - { - $this->rowSpan = $rowSpan; - } - public function getRowSpan() - { - return $this->rowSpan; - } - public function setText($text) - { - $this->text = $text; - } - public function getText() - { - return $this->text; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1Block - */ - public function setTextBlock(Google_Service_Vision_GoogleCloudVisionV1p5beta1Block $textBlock) - { - $this->textBlock = $textBlock; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1Block - */ - public function getTextBlock() - { - return $this->textBlock; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1TextAnnotationTextProperty.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1TextAnnotationTextProperty.php deleted file mode 100644 index cd8a351..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1TextAnnotationTextProperty.php +++ /dev/null @@ -1,54 +0,0 @@ -detectedBreak = $detectedBreak; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1TextAnnotationDetectedBreak - */ - public function getDetectedBreak() - { - return $this->detectedBreak; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1TextAnnotationDetectedLanguage - */ - public function setDetectedLanguages($detectedLanguages) - { - $this->detectedLanguages = $detectedLanguages; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1TextAnnotationDetectedLanguage - */ - public function getDetectedLanguages() - { - return $this->detectedLanguages; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1WebDetection.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1WebDetection.php deleted file mode 100644 index 0906040..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1WebDetection.php +++ /dev/null @@ -1,118 +0,0 @@ -bestGuessLabels = $bestGuessLabels; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1WebDetectionWebLabel - */ - public function getBestGuessLabels() - { - return $this->bestGuessLabels; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1WebDetectionWebImage - */ - public function setFullMatchingImages($fullMatchingImages) - { - $this->fullMatchingImages = $fullMatchingImages; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1WebDetectionWebImage - */ - public function getFullMatchingImages() - { - return $this->fullMatchingImages; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1WebDetectionWebPage - */ - public function setPagesWithMatchingImages($pagesWithMatchingImages) - { - $this->pagesWithMatchingImages = $pagesWithMatchingImages; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1WebDetectionWebPage - */ - public function getPagesWithMatchingImages() - { - return $this->pagesWithMatchingImages; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1WebDetectionWebImage - */ - public function setPartialMatchingImages($partialMatchingImages) - { - $this->partialMatchingImages = $partialMatchingImages; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1WebDetectionWebImage - */ - public function getPartialMatchingImages() - { - return $this->partialMatchingImages; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1WebDetectionWebImage - */ - public function setVisuallySimilarImages($visuallySimilarImages) - { - $this->visuallySimilarImages = $visuallySimilarImages; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1WebDetectionWebImage - */ - public function getVisuallySimilarImages() - { - return $this->visuallySimilarImages; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1WebDetectionWebEntity - */ - public function setWebEntities($webEntities) - { - $this->webEntities = $webEntities; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1WebDetectionWebEntity - */ - public function getWebEntities() - { - return $this->webEntities; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1WebDetectionWebPage.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1WebDetectionWebPage.php deleted file mode 100644 index 31c2443..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1WebDetectionWebPage.php +++ /dev/null @@ -1,81 +0,0 @@ -fullMatchingImages = $fullMatchingImages; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1WebDetectionWebImage - */ - public function getFullMatchingImages() - { - return $this->fullMatchingImages; - } - public function setPageTitle($pageTitle) - { - $this->pageTitle = $pageTitle; - } - public function getPageTitle() - { - return $this->pageTitle; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1WebDetectionWebImage - */ - public function setPartialMatchingImages($partialMatchingImages) - { - $this->partialMatchingImages = $partialMatchingImages; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1WebDetectionWebImage - */ - public function getPartialMatchingImages() - { - return $this->partialMatchingImages; - } - public function setScore($score) - { - $this->score = $score; - } - public function getScore() - { - return $this->score; - } - public function setUrl($url) - { - $this->url = $url; - } - public function getUrl() - { - return $this->url; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1Word.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1Word.php deleted file mode 100644 index 14bc150..0000000 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1Word.php +++ /dev/null @@ -1,88 +0,0 @@ -boundingBox = $boundingBox; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1BoundingPoly - */ - public function getBoundingBox() - { - return $this->boundingBox; - } - public function setConfidence($confidence) - { - $this->confidence = $confidence; - } - public function getConfidence() - { - return $this->confidence; - } - public function setMergedText($mergedText) - { - $this->mergedText = $mergedText; - } - public function getMergedText() - { - return $this->mergedText; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1TextAnnotationTextProperty - */ - public function setProperty(Google_Service_Vision_GoogleCloudVisionV1p5beta1TextAnnotationTextProperty $property) - { - $this->property = $property; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1TextAnnotationTextProperty - */ - public function getProperty() - { - return $this->property; - } - /** - * @param Google_Service_Vision_GoogleCloudVisionV1p5beta1Symbol - */ - public function setSymbols($symbols) - { - $this->symbols = $symbols; - } - /** - * @return Google_Service_Vision_GoogleCloudVisionV1p5beta1Symbol - */ - public function getSymbols() - { - return $this->symbols; - } -} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GroupedResult.php b/vendor/google/apiclient-services/src/Google/Service/Vision/GroupedResult.php index 7793dbc..489b1f5 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GroupedResult.php +++ b/vendor/google/apiclient-services/src/Google/Service/Vision/GroupedResult.php @@ -20,6 +20,8 @@ class Google_Service_Vision_GroupedResult extends Google_Collection protected $collection_key = 'results'; protected $boundingPolyType = 'Google_Service_Vision_BoundingPoly'; protected $boundingPolyDataType = ''; + protected $objectAnnotationsType = 'Google_Service_Vision_ObjectAnnotation'; + protected $objectAnnotationsDataType = 'array'; protected $resultsType = 'Google_Service_Vision_Result'; protected $resultsDataType = 'array'; @@ -37,6 +39,20 @@ class Google_Service_Vision_GroupedResult extends Google_Collection { return $this->boundingPoly; } + /** + * @param Google_Service_Vision_ObjectAnnotation + */ + public function setObjectAnnotations($objectAnnotations) + { + $this->objectAnnotations = $objectAnnotations; + } + /** + * @return Google_Service_Vision_ObjectAnnotation + */ + public function getObjectAnnotations() + { + return $this->objectAnnotations; + } /** * @param Google_Service_Vision_Result */ diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1WebDetectionWebLabel.php b/vendor/google/apiclient-services/src/Google/Service/Vision/ObjectAnnotation.php similarity index 63% rename from vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1WebDetectionWebLabel.php rename to vendor/google/apiclient-services/src/Google/Service/Vision/ObjectAnnotation.php index 4b1e0b3..b52b91b 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/GoogleCloudVisionV1p5beta1WebDetectionWebLabel.php +++ b/vendor/google/apiclient-services/src/Google/Service/Vision/ObjectAnnotation.php @@ -15,19 +15,13 @@ * the License. */ -class Google_Service_Vision_GoogleCloudVisionV1p5beta1WebDetectionWebLabel extends Google_Model +class Google_Service_Vision_ObjectAnnotation extends Google_Model { - public $label; public $languageCode; + public $mid; + public $name; + public $score; - public function setLabel($label) - { - $this->label = $label; - } - public function getLabel() - { - return $this->label; - } public function setLanguageCode($languageCode) { $this->languageCode = $languageCode; @@ -36,4 +30,28 @@ class Google_Service_Vision_GoogleCloudVisionV1p5beta1WebDetectionWebLabel exten { return $this->languageCode; } + 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 setScore($score) + { + $this->score = $score; + } + public function getScore() + { + return $this->score; + } } diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/ProductSetPurgeConfig.php b/vendor/google/apiclient-services/src/Google/Service/Vision/ProductSetPurgeConfig.php new file mode 100644 index 0000000..08f9812 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Vision/ProductSetPurgeConfig.php @@ -0,0 +1,30 @@ +productSetId = $productSetId; + } + public function getProductSetId() + { + return $this->productSetId; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/PurgeProductsRequest.php b/vendor/google/apiclient-services/src/Google/Service/Vision/PurgeProductsRequest.php new file mode 100644 index 0000000..51b2ab7 --- /dev/null +++ b/vendor/google/apiclient-services/src/Google/Service/Vision/PurgeProductsRequest.php @@ -0,0 +1,55 @@ +deleteOrphanProducts = $deleteOrphanProducts; + } + public function getDeleteOrphanProducts() + { + return $this->deleteOrphanProducts; + } + public function setForce($force) + { + $this->force = $force; + } + public function getForce() + { + return $this->force; + } + /** + * @param Google_Service_Vision_ProductSetPurgeConfig + */ + public function setProductSetPurgeConfig(Google_Service_Vision_ProductSetPurgeConfig $productSetPurgeConfig) + { + $this->productSetPurgeConfig = $productSetPurgeConfig; + } + /** + * @return Google_Service_Vision_ProductSetPurgeConfig + */ + public function getProductSetPurgeConfig() + { + return $this->productSetPurgeConfig; + } +} diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/Resource/ProjectsLocationsProductSets.php b/vendor/google/apiclient-services/src/Google/Service/Vision/Resource/ProjectsLocationsProductSets.php index 3e3942b..a13a95b 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/Resource/ProjectsLocationsProductSets.php +++ b/vendor/google/apiclient-services/src/Google/Service/Vision/Resource/ProjectsLocationsProductSets.php @@ -36,7 +36,7 @@ class Google_Service_Vision_Resource_ProjectsLocationsProductSets extends Google * * Returns NOT_FOUND if the Product or the ProductSet doesn't exist. * (productSets.addProduct) * - * @param string $name The resource name for the ProductSet to modify. + * @param string $name Required. The resource name for the ProductSet to modify. * * Format is: `projects/PROJECT_ID/locations/LOC_ID/productSets/PRODUCT_SET_ID` * @param Google_Service_Vision_AddProductToProductSetRequest $postBody @@ -57,7 +57,8 @@ class Google_Service_Vision_Resource_ProjectsLocationsProductSets extends Google * * Returns INVALID_ARGUMENT if display_name is missing, or is longer than * 4096 characters. (productSets.create) * - * @param string $parent The project in which the ProductSet should be created. + * @param string $parent Required. The project in which the ProductSet should be + * created. * * Format is `projects/PROJECT_ID/locations/LOC_ID`. * @param Google_Service_Vision_ProductSet $postBody @@ -82,7 +83,7 @@ class Google_Service_Vision_Resource_ProjectsLocationsProductSets extends Google * The actual image files are not deleted from Google Cloud Storage. * (productSets.delete) * - * @param string $name Resource name of the ProductSet to delete. + * @param string $name Required. Resource name of the ProductSet to delete. * * Format is: `projects/PROJECT_ID/locations/LOC_ID/productSets/PRODUCT_SET_ID` * @param array $optParams Optional parameters. @@ -101,7 +102,7 @@ class Google_Service_Vision_Resource_ProjectsLocationsProductSets extends Google * * * Returns NOT_FOUND if the ProductSet does not exist. (productSets.get) * - * @param string $name Resource name of the ProductSet to get. + * @param string $name Required. Resource name of the ProductSet to get. * * Format is: `projects/PROJECT_ID/locations/LOG_ID/productSets/PRODUCT_SET_ID` * @param array $optParams Optional parameters. @@ -126,8 +127,8 @@ class Google_Service_Vision_Resource_ProjectsLocationsProductSets extends Google * the format of the csv file please see * ImportProductSetsGcsSource.csv_file_uri. (productSets.import) * - * @param string $parent The project in which the ProductSets should be - * imported. + * @param string $parent Required. The project in which the ProductSets should + * be imported. * * Format is `projects/PROJECT_ID/locations/LOC_ID`. * @param Google_Service_Vision_ImportProductSetsRequest $postBody @@ -148,7 +149,8 @@ class Google_Service_Vision_Resource_ProjectsLocationsProductSets extends Google * * Returns INVALID_ARGUMENT if page_size is greater than 100, or less than * 1. (productSets.listProjectsLocationsProductSets) * - * @param string $parent The project from which ProductSets should be listed. + * @param string $parent Required. The project from which ProductSets should be + * listed. * * Format is `projects/PROJECT_ID/locations/LOC_ID`. * @param array $optParams Optional parameters. @@ -197,7 +199,7 @@ class Google_Service_Vision_Resource_ProjectsLocationsProductSets extends Google /** * Removes a Product from the specified ProductSet. (productSets.removeProduct) * - * @param string $name The resource name for the ProductSet to modify. + * @param string $name Required. The resource name for the ProductSet to modify. * * Format is: `projects/PROJECT_ID/locations/LOC_ID/productSets/PRODUCT_SET_ID` * @param Google_Service_Vision_RemoveProductFromProductSetRequest $postBody diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/Resource/ProjectsLocationsProductSetsProducts.php b/vendor/google/apiclient-services/src/Google/Service/Vision/Resource/ProjectsLocationsProductSetsProducts.php index 72dbe31..8fd326d 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/Resource/ProjectsLocationsProductSetsProducts.php +++ b/vendor/google/apiclient-services/src/Google/Service/Vision/Resource/ProjectsLocationsProductSetsProducts.php @@ -34,7 +34,8 @@ class Google_Service_Vision_Resource_ProjectsLocationsProductSetsProducts extend * * Returns INVALID_ARGUMENT if page_size is greater than 100 or less than 1. * (products.listProjectsLocationsProductSetsProducts) * - * @param string $name The ProductSet resource for which to retrieve Products. + * @param string $name Required. The ProductSet resource for which to retrieve + * Products. * * Format is: `projects/PROJECT_ID/locations/LOC_ID/productSets/PRODUCT_SET_ID` * @param array $optParams Optional parameters. diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/Resource/ProjectsLocationsProducts.php b/vendor/google/apiclient-services/src/Google/Service/Vision/Resource/ProjectsLocationsProducts.php index 32f66f8..b78984c 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/Resource/ProjectsLocationsProducts.php +++ b/vendor/google/apiclient-services/src/Google/Service/Vision/Resource/ProjectsLocationsProducts.php @@ -35,7 +35,8 @@ class Google_Service_Vision_Resource_ProjectsLocationsProducts extends Google_Se * characters. * Returns INVALID_ARGUMENT if product_category is missing or * invalid. (products.create) * - * @param string $parent The project in which the Product should be created. + * @param string $parent Required. The project in which the Product should be + * created. * * Format is `projects/PROJECT_ID/locations/LOC_ID`. * @param Google_Service_Vision_Product $postBody @@ -60,7 +61,7 @@ class Google_Service_Vision_Resource_ProjectsLocationsProducts extends Google_Se * search queries against ProductSets containing the product may still work * until all related caches are refreshed. (products.delete) * - * @param string $name Resource name of product to delete. + * @param string $name Required. Resource name of product to delete. * * Format is: `projects/PROJECT_ID/locations/LOC_ID/products/PRODUCT_ID` * @param array $optParams Optional parameters. @@ -79,7 +80,7 @@ class Google_Service_Vision_Resource_ProjectsLocationsProducts extends Google_Se * * * Returns NOT_FOUND if the Product does not exist. (products.get) * - * @param string $name Resource name of the Product to get. + * @param string $name Required. Resource name of the Product to get. * * Format is: `projects/PROJECT_ID/locations/LOC_ID/products/PRODUCT_ID` * @param array $optParams Optional parameters. @@ -99,8 +100,8 @@ class Google_Service_Vision_Resource_ProjectsLocationsProducts extends Google_Se * * Returns INVALID_ARGUMENT if page_size is greater than 100 or less than 1. * (products.listProjectsLocationsProducts) * - * @param string $parent The project OR ProductSet from which Products should be - * listed. + * @param string $parent Required. The project OR ProductSet from which Products + * should be listed. * * Format: `projects/PROJECT_ID/locations/LOC_ID` * @param array $optParams Optional parameters. @@ -152,4 +153,43 @@ class Google_Service_Vision_Resource_ProjectsLocationsProducts extends Google_Se $params = array_merge($params, $optParams); return $this->call('patch', array($params), "Google_Service_Vision_Product"); } + /** + * Asynchronous API to delete all Products in a ProductSet or all Products that + * are in no ProductSet. + * + * If a Product is a member of the specified ProductSet in addition to other + * ProductSets, the Product will still be deleted. + * + * It is recommended to not delete the specified ProductSet until after this + * operation has completed. It is also recommended to not add any of the + * Products involved in the batch delete to a new ProductSet while this + * operation is running because those Products may still end up deleted. + * + * It's not possible to undo the PurgeProducts operation. Therefore, it is + * recommended to keep the csv files used in ImportProductSets (if that was how + * you originally built the Product Set) before starting PurgeProducts, in case + * you need to re-import the data after deletion. + * + * If the plan is to purge all of the Products from a ProductSet and then re-use + * the empty ProductSet to re-import new Products into the empty ProductSet, you + * must wait until the PurgeProducts operation has finished for that ProductSet. + * + * The google.longrunning.Operation API can be used to keep track of the + * progress and results of the request. `Operation.metadata` contains + * `BatchOperationMetadata`. (progress) (products.purge) + * + * @param string $parent Required. The project and location in which the + * Products should be deleted. + * + * Format is `projects/PROJECT_ID/locations/LOC_ID`. + * @param Google_Service_Vision_PurgeProductsRequest $postBody + * @param array $optParams Optional parameters. + * @return Google_Service_Vision_Operation + */ + public function purge($parent, Google_Service_Vision_PurgeProductsRequest $postBody, $optParams = array()) + { + $params = array('parent' => $parent, 'postBody' => $postBody); + $params = array_merge($params, $optParams); + return $this->call('purge', array($params), "Google_Service_Vision_Operation"); + } } diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/Resource/ProjectsLocationsProductsReferenceImages.php b/vendor/google/apiclient-services/src/Google/Service/Vision/Resource/ProjectsLocationsProductsReferenceImages.php index 35de0a1..d7e57dd 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/Resource/ProjectsLocationsProductsReferenceImages.php +++ b/vendor/google/apiclient-services/src/Google/Service/Vision/Resource/ProjectsLocationsProductsReferenceImages.php @@ -46,8 +46,8 @@ class Google_Service_Vision_Resource_ProjectsLocationsProductsReferenceImages ex * INVALID_ARGUMENT if bounding_poly contains more than 10 polygons. * (referenceImages.create) * - * @param string $parent Resource name of the product in which to create the - * reference image. + * @param string $parent Required. Resource name of the product in which to + * create the reference image. * * Format is `projects/PROJECT_ID/locations/LOC_ID/products/PRODUCT_ID`. * @param Google_Service_Vision_ReferenceImage $postBody @@ -76,7 +76,8 @@ class Google_Service_Vision_Resource_ProjectsLocationsProductsReferenceImages ex * The actual image files are not deleted from Google Cloud Storage. * (referenceImages.delete) * - * @param string $name The resource name of the reference image to delete. + * @param string $name Required. The resource name of the reference image to + * delete. * * Format is: * @@ -99,7 +100,7 @@ class Google_Service_Vision_Resource_ProjectsLocationsProductsReferenceImages ex * * Returns NOT_FOUND if the specified image does not exist. * (referenceImages.get) * - * @param string $name The resource name of the ReferenceImage to get. + * @param string $name Required. The resource name of the ReferenceImage to get. * * Format is: * @@ -123,8 +124,8 @@ class Google_Service_Vision_Resource_ProjectsLocationsProductsReferenceImages ex * INVALID_ARGUMENT if the page_size is greater than 100, or less than 1. * (referenceImages.listProjectsLocationsProductsReferenceImages) * - * @param string $parent Resource name of the product containing the reference - * images. + * @param string $parent Required. Resource name of the product containing the + * reference images. * * Format is `projects/PROJECT_ID/locations/LOC_ID/products/PRODUCT_ID`. * @param array $optParams Optional parameters. diff --git a/vendor/google/apiclient-services/src/Google/Service/Vision/SafeSearchAnnotation.php b/vendor/google/apiclient-services/src/Google/Service/Vision/SafeSearchAnnotation.php index ac202a8..fb613b6 100644 --- a/vendor/google/apiclient-services/src/Google/Service/Vision/SafeSearchAnnotation.php +++ b/vendor/google/apiclient-services/src/Google/Service/Vision/SafeSearchAnnotation.php @@ -18,16 +18,10 @@ class Google_Service_Vision_SafeSearchAnnotation extends Google_Model { public $adult; - public $adultConfidence; public $medical; - public $medicalConfidence; - public $nsfwConfidence; public $racy; - public $racyConfidence; public $spoof; - public $spoofConfidence; public $violence; - public $violenceConfidence; public function setAdult($adult) { @@ -37,14 +31,6 @@ class Google_Service_Vision_SafeSearchAnnotation extends Google_Model { return $this->adult; } - public function setAdultConfidence($adultConfidence) - { - $this->adultConfidence = $adultConfidence; - } - public function getAdultConfidence() - { - return $this->adultConfidence; - } public function setMedical($medical) { $this->medical = $medical; @@ -53,22 +39,6 @@ class Google_Service_Vision_SafeSearchAnnotation extends Google_Model { return $this->medical; } - public function setMedicalConfidence($medicalConfidence) - { - $this->medicalConfidence = $medicalConfidence; - } - public function getMedicalConfidence() - { - return $this->medicalConfidence; - } - public function setNsfwConfidence($nsfwConfidence) - { - $this->nsfwConfidence = $nsfwConfidence; - } - public function getNsfwConfidence() - { - return $this->nsfwConfidence; - } public function setRacy($racy) { $this->racy = $racy; @@ -77,14 +47,6 @@ class Google_Service_Vision_SafeSearchAnnotation extends Google_Model { return $this->racy; } - public function setRacyConfidence($racyConfidence) - { - $this->racyConfidence = $racyConfidence; - } - public function getRacyConfidence() - { - return $this->racyConfidence; - } public function setSpoof($spoof) { $this->spoof = $spoof; @@ -93,14 +55,6 @@ class Google_Service_Vision_SafeSearchAnnotation extends Google_Model { return $this->spoof; } - public function setSpoofConfidence($spoofConfidence) - { - $this->spoofConfidence = $spoofConfidence; - } - public function getSpoofConfidence() - { - return $this->spoofConfidence; - } public function setViolence($violence) { $this->violence = $violence; @@ -109,12 +63,4 @@ class Google_Service_Vision_SafeSearchAnnotation extends Google_Model { return $this->violence; } - public function setViolenceConfidence($violenceConfidence) - { - $this->violenceConfidence = $violenceConfidence; - } - public function getViolenceConfidence() - { - return $this->violenceConfidence; - } } diff --git a/vendor/google/apiclient-services/src/Google/Service/YouTube/ContentRating.php b/vendor/google/apiclient-services/src/Google/Service/YouTube/ContentRating.php index c48220f..cddf93e 100644 --- a/vendor/google/apiclient-services/src/Google/Service/YouTube/ContentRating.php +++ b/vendor/google/apiclient-services/src/Google/Service/YouTube/ContentRating.php @@ -76,6 +76,7 @@ class Google_Service_YouTube_ContentRating extends Google_Collection public $nfrcRating; public $nfvcbRating; public $nkclvRating; + public $nmcRating; public $oflcRating; public $pefilmRating; public $rcnofRating; @@ -553,6 +554,14 @@ class Google_Service_YouTube_ContentRating extends Google_Collection { return $this->nkclvRating; } + public function setNmcRating($nmcRating) + { + $this->nmcRating = $nmcRating; + } + public function getNmcRating() + { + return $this->nmcRating; + } public function setOflcRating($oflcRating) { $this->oflcRating = $oflcRating; diff --git a/vendor/google/apiclient/README.md b/vendor/google/apiclient/README.md index 36f04c8..c0267f7 100644 --- a/vendor/google/apiclient/README.md +++ b/vendor/google/apiclient/README.md @@ -351,7 +351,7 @@ Please see the [contributing](.github/CONTRIBUTING.md) page for more information For support with the library the best place to ask is via the google-api-php-client tag on StackOverflow: https://stackoverflow.com/questions/tagged/google-api-php-client -If there is a specific bug with the library, please [file a issue](https://github.com/googleapis/google-api-php-client/issues) in the GitHub issues tracker, including an example of the failing code and any specific errors retrieved. Feature requests can also be filed, as long as they are core library requests, and not-API specific: for those, refer to the documentation for the individual APIs for the best place to file requests. Please try to provide a clear statement of the problem that the feature would address. +If there is a specific bug with the library, please [file an issue](https://github.com/googleapis/google-api-php-client/issues) in the GitHub issues tracker, including an example of the failing code and any specific errors retrieved. Feature requests can also be filed, as long as they are core library requests, and not-API specific: for those, refer to the documentation for the individual APIs for the best place to file requests. Please try to provide a clear statement of the problem that the feature would address. ### I want an example of X! ### diff --git a/vendor/google/apiclient/composer.json b/vendor/google/apiclient/composer.json index ce1e12e..d69dca5 100644 --- a/vendor/google/apiclient/composer.json +++ b/vendor/google/apiclient/composer.json @@ -10,7 +10,7 @@ "google/auth": "^1.0", "google/apiclient-services": "~0.13", "firebase/php-jwt": "~2.0||~3.0||~4.0||~5.0", - "monolog/monolog": "^1.17", + "monolog/monolog": "^1.17|^2.0", "phpseclib/phpseclib": "~0.3.10||~2.0", "guzzlehttp/guzzle": "~5.3.1||~6.0", "guzzlehttp/psr7": "^1.2" diff --git a/vendor/google/apiclient/phpcs.xml.dist b/vendor/google/apiclient/phpcs.xml.dist deleted file mode 100644 index 4e43069..0000000 --- a/vendor/google/apiclient/phpcs.xml.dist +++ /dev/null @@ -1,164 +0,0 @@ - - - The Google API client library coding standard. - - - - 0 - - - - - - - - - - - - - - - - - - - - - - - Service/*.php - - - - - - - - - - - - - - - - - - - - - - - Service/*.php - - - - - - - - - - 0 - - - 0 - - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vendor/google/apiclient/src/Google/Client.php b/vendor/google/apiclient/src/Google/Client.php index 218aae5..5785ac1 100644 --- a/vendor/google/apiclient/src/Google/Client.php +++ b/vendor/google/apiclient/src/Google/Client.php @@ -38,7 +38,7 @@ use Monolog\Handler\SyslogHandler as MonologSyslogHandler; */ class Google_Client { - const LIBVER = "2.2.4"; + const LIBVER = "2.4.0"; const USER_AGENT_SUFFIX = "google-api-php-client/"; const OAUTH2_REVOKE_URI = 'https://oauth2.googleapis.com/revoke'; const OAUTH2_TOKEN_URI = 'https://oauth2.googleapis.com/token'; @@ -804,12 +804,24 @@ class Google_Client */ public function execute(RequestInterface $request, $expectedClass = null) { - $request = $request->withHeader( - 'User-Agent', - $this->config['application_name'] - . " " . self::USER_AGENT_SUFFIX - . $this->getLibraryVersion() - ); + $request = $request + ->withHeader( + 'User-Agent', + sprintf( + '%s %s%s', + $this->config['application_name'], + self::USER_AGENT_SUFFIX, + $this->getLibraryVersion() + ) + ) + ->withHeader( + 'x-goog-api-client', + sprintf( + 'gl-php/%s gdcl/%s', + phpversion(), + $this->getLibraryVersion() + ) + ); if ($this->config['api_format_v2']) { $request = $request->withHeader( diff --git a/vendor/google/apiclient/src/Google/Http/MediaFileUpload.php b/vendor/google/apiclient/src/Google/Http/MediaFileUpload.php index 600e678..f4ee976 100644 --- a/vendor/google/apiclient/src/Google/Http/MediaFileUpload.php +++ b/vendor/google/apiclient/src/Google/Http/MediaFileUpload.php @@ -67,9 +67,11 @@ class Google_Http_MediaFileUpload private $httpResultCode; /** - * @param $mimeType string - * @param $data string The bytes you want to upload. - * @param $resumable bool + * @param Google_Client $client + * @param RequestInterface $request + * @param string $mimeType + * @param string $data The bytes you want to upload. + * @param bool $resumable * @param bool $chunkSize File will be uploaded in chunks of this many bytes. * only used if resumable=True */ diff --git a/vendor/google/auth/CHANGELOG.md b/vendor/google/auth/CHANGELOG.md index de74652..9788b06 100644 --- a/vendor/google/auth/CHANGELOG.md +++ b/vendor/google/auth/CHANGELOG.md @@ -1,3 +1,10 @@ +## 1.6.0 (10/01/2019) + +* [feat] Add utility for verifying and revoking access tokens. (#243) +* [docs] Fix README console terminology. (#242) +* [feat] Support custom scopes with GCECredentials. (#239) +* [fix] Fix phpseclib existence check. (#237) + ## 1.5.2 (07/22/2019) * [fix] Move loadItems call out of `SysVCacheItemPool` constructor. (#229) diff --git a/vendor/google/auth/README.md b/vendor/google/auth/README.md index 148ed16..eea62ee 100644 --- a/vendor/google/auth/README.md +++ b/vendor/google/auth/README.md @@ -47,7 +47,7 @@ you're building an application that uses Google Compute Engine. #### Download your Service Account Credentials JSON file To use `Application Default Credentials`, You first need to download a set of -JSON credentials for your project. Go to **APIs & Auth** > **Credentials** in +JSON credentials for your project. Go to **APIs & Services** > **Credentials** in the [Google Developers Console][developer console] and select **Service account** from the **Add credentials** dropdown. diff --git a/vendor/google/auth/composer.json b/vendor/google/auth/composer.json index 3ded33d..d488af1 100644 --- a/vendor/google/auth/composer.json +++ b/vendor/google/auth/composer.json @@ -21,7 +21,7 @@ "phpseclib/phpseclib": "^2" }, "suggest": { - "phpseclib/phpseclib": "May be used in place of OpenSSL for signing strings. Please require version ^2." + "phpseclib/phpseclib": "May be used in place of OpenSSL for signing strings or for token management. Please require version ^2." }, "autoload": { "psr-4": { diff --git a/vendor/google/auth/src/AccessToken.php b/vendor/google/auth/src/AccessToken.php new file mode 100644 index 0000000..a60494c --- /dev/null +++ b/vendor/google/auth/src/AccessToken.php @@ -0,0 +1,320 @@ +httpHandler = $httpHandler + ?: HttpHandlerFactory::build(HttpClientCache::getHttpClient()); + $this->cache = $cache ?: new MemoryCacheItemPool(); + $this->configureJwtService(); + + // set phpseclib constants if applicable + $this->setPhpsecConstants(); + } + + /** + * Verifies an id token and returns the authenticated apiLoginTicket. + * Throws an exception if the id token is not valid. + * The audience parameter can be used to control which id tokens are + * accepted. By default, the id token must have been issued to this OAuth2 client. + * + * @param string $token The JSON Web Token to be verified. + * @param array $options [optional] { + * Configuration options. + * + * @type string $audience The indended recipient of the token. + * @type string $certsLocation The location (remote or local) from which + * to retrieve certificates, if not cached. This value should only be + * provided in limited circumstances in which you are sure of the + * behavior. + * } + * @return array|bool the token payload, if successful, or false if not. + * @throws \InvalidArgumentException If certs could not be retrieved from a local file. + * @throws \InvalidArgumentException If received certs are in an invalid format. + * @throws \RuntimeException If certs could not be retrieved from a remote location. + */ + public function verify($token, array $options = []) + { + $audience = isset($options['audience']) + ? $options['audience'] + : null; + $certsLocation = isset($options['certsLocation']) + ? $options['certsLocation'] + : self::FEDERATED_SIGNON_CERT_URL; + + unset($options['audience'], $options['certsLocation']); + + // Check signature against each available cert. + // allow the loop to complete unless a known bad result is encountered. + $certs = $this->getFederatedSignOnCerts($certsLocation, $options); + foreach ($certs as $cert) { + $rsa = new RSA(); + $rsa->loadKey([ + 'n' => new BigInteger($this->callJwtStatic('urlsafeB64Decode', [ + $cert['n'] + ]), 256), + 'e' => new BigInteger($this->callJwtStatic('urlsafeB64Decode', [ + $cert['e'] + ]), 256) + ]); + + try { + $pubkey = $rsa->getPublicKey(); + $payload = $this->callJwtStatic('decode', [ + $token, + $pubkey, + ['RS256'] + ]); + + if (property_exists($payload, 'aud')) { + if ($audience && $payload->aud != $audience) { + return false; + } + } + + // support HTTP and HTTPS issuers + // @see https://developers.google.com/identity/sign-in/web/backend-auth + $issuers = [self::OAUTH2_ISSUER, self::OAUTH2_ISSUER_HTTPS]; + if (!isset($payload->iss) || !in_array($payload->iss, $issuers)) { + return false; + } + + return (array) $payload; + } catch (ExpiredException $e) { + return false; + } catch (\ExpiredException $e) { + // (firebase/php-jwt 2) + return false; + } catch (SignatureInvalidException $e) { + // continue + } catch (\SignatureInvalidException $e) { + // continue (firebase/php-jwt 2) + } catch (\DomainException $e) { + // continue + } + } + + return false; + } + + /** + * Revoke an OAuth2 access token or refresh token. This method will revoke the current access + * token, if a token isn't provided. + * + * @param string|array $token The token (access token or a refresh token) that should be revoked. + * @param array $options [optional] Configuration options. + * @return boolean Returns True if the revocation was successful, otherwise False. + */ + public function revoke($token, array $options = []) + { + if (is_array($token)) { + if (isset($token['refresh_token'])) { + $token = $token['refresh_token']; + } else { + $token = $token['access_token']; + } + } + + $body = Psr7\stream_for(http_build_query(['token' => $token])); + $request = new Request('POST', self::OAUTH2_REVOKE_URI, [ + 'Cache-Control' => 'no-store', + 'Content-Type' => 'application/x-www-form-urlencoded', + ], $body); + + $httpHandler = $this->httpHandler; + + $response = $httpHandler($request, $options); + + return $response->getStatusCode() == 200; + } + + /** + * Gets federated sign-on certificates to use for verifying identity tokens. + * Returns certs as array structure, where keys are key ids, and values + * are PEM encoded certificates. + * + * @param string $location The location from which to retrieve certs. + * @param array $options [optional] Configuration options. + * @return array + * @throws \InvalidArgumentException If received certs are in an invalid format. + */ + private function getFederatedSignOnCerts($location, array $options = []) + { + $cacheItem = $this->cache->getItem('federated_signon_certs_v3'); + $certs = $cacheItem ? $cacheItem->get() : null; + + $gotNewCerts = false; + if (!$certs) { + $certs = $this->retrieveCertsFromLocation($location, $options); + + $gotNewCerts = true; + } + + if (!isset($certs['keys'])) { + throw new \InvalidArgumentException( + 'federated sign-on certs expects "keys" to be set' + ); + } + + // Push caching off until after verifying certs are in a valid format. + // Don't want to cache bad data. + if ($gotNewCerts) { + $cacheItem->expiresAt(new \DateTime('+1 hour')); + $cacheItem->set($certs); + $this->cache->save($cacheItem); + } + + return $certs['keys']; + } + + /** + * Retrieve and cache a certificates file. + * + * @param $url string location + * @param array $options [optional] Configuration options. + * @throws \RuntimeException + * @return array certificates + * @throws \InvalidArgumentException If certs could not be retrieved from a local file. + * @throws \RuntimeException If certs could not be retrieved from a remote location. + */ + private function retrieveCertsFromLocation($url, array $options = []) + { + // If we're retrieving a local file, just grab it. + if (strpos($url, 'http') !== 0) { + if (!file_exists($url)) { + throw new \InvalidArgumentException(sprintf( + 'Failed to retrieve verification certificates from path: %s.', + $url + )); + } + + return json_decode(file_get_contents($url), true); + } + + $httpHandler = $this->httpHandler; + $response = $httpHandler(new Request('GET', $url), $options); + + if ($response->getStatusCode() == 200) { + return json_decode((string) $response->getBody(), true); + } + + throw new \RuntimeException(sprintf( + 'Failed to retrieve verification certificates: "%s".', + $response->getBody()->getContents() + ), $response->getStatusCode()); + } + + /** + * Set required defaults for JWT. + */ + private function configureJwtService() + { + $class = class_exists('Firebase\JWT\JWT') + ? 'Firebase\JWT\JWT' + : '\JWT'; + + if (property_exists($class, 'leeway') && $class::$leeway < 1) { + // Ensures JWT leeway is at least 1 + // @see https://github.com/google/google-api-php-client/issues/827 + $class::$leeway = 1; + } + } + + /** + * phpseclib calls "phpinfo" by default, which requires special + * whitelisting in the AppEngine VM environment. This function + * sets constants to bypass the need for phpseclib to check phpinfo + * + * @see phpseclib/Math/BigInteger + * @see https://github.com/GoogleCloudPlatform/getting-started-php/issues/85 + * @codeCoverageIgnore + */ + private function setPhpsecConstants() + { + if (filter_var(getenv('GAE_VM'), FILTER_VALIDATE_BOOLEAN)) { + if (!defined('MATH_BIGINTEGER_OPENSSL_ENABLED')) { + define('MATH_BIGINTEGER_OPENSSL_ENABLED', true); + } + if (!defined('CRYPT_RSA_MODE')) { + define('CRYPT_RSA_MODE', RSA::MODE_OPENSSL); + } + } + } + + /** + * Provide a hook to mock calls to the JWT static methods. + * + * @param string $method + * @param array $args + * @return mixed + */ + protected function callJwtStatic($method, array $args = []) + { + $class = class_exists('Firebase\JWT\JWT') + ? 'Firebase\JWT\JWT' + : 'JWT'; + return call_user_func_array([$class, $method], $args); + } +} diff --git a/vendor/google/auth/src/ApplicationDefaultCredentials.php b/vendor/google/auth/src/ApplicationDefaultCredentials.php index eca3dc9..1cfca8e 100644 --- a/vendor/google/auth/src/ApplicationDefaultCredentials.php +++ b/vendor/google/auth/src/ApplicationDefaultCredentials.php @@ -161,7 +161,7 @@ class ApplicationDefaultCredentials } elseif (AppIdentityCredentials::onAppEngine() && !GCECredentials::onAppEngineFlexible()) { $creds = new AppIdentityCredentials($scope); } elseif (GCECredentials::onGce($httpHandler)) { - $creds = new GCECredentials(); + $creds = new GCECredentials(null, $scope); } if (is_null($creds)) { diff --git a/vendor/google/auth/src/Credentials/GCECredentials.php b/vendor/google/auth/src/Credentials/GCECredentials.php index 8e262f3..24cdd4a 100644 --- a/vendor/google/auth/src/Credentials/GCECredentials.php +++ b/vendor/google/auth/src/Credentials/GCECredentials.php @@ -121,11 +121,31 @@ class GCECredentials extends CredentialsLoader implements SignBlobInterface private $iam; /** - * @param Iam $iam [optional] An IAM instance. + * @var string */ - public function __construct(Iam $iam = null) + private $tokenUri; + + /** + * @param Iam $iam [optional] An IAM instance. + * @param string|array $scope [optional] the scope of the access request, + * expressed either as an array or as a space-delimited string. + */ + public function __construct(Iam $iam = null, $scope = null) { $this->iam = $iam; + + $tokenUri = self::getTokenUri(); + if ($scope) { + if (is_string($scope)) { + $scope = explode(' ', $scope); + } + + $scope = implode(',', $scope); + + $tokenUri = $tokenUri . '?scopes='. $scope; + } + + $this->tokenUri = $tokenUri; } /** @@ -235,7 +255,7 @@ class GCECredentials extends CredentialsLoader implements SignBlobInterface return array(); // return an empty array with no access token } - $json = $this->getFromMetadata($httpHandler, self::getTokenUri()); + $json = $this->getFromMetadata($httpHandler, $this->tokenUri); if (null === $json = json_decode($json, true)) { throw new \Exception('Invalid JSON response'); } diff --git a/vendor/google/auth/src/ServiceAccountSignerTrait.php b/vendor/google/auth/src/ServiceAccountSignerTrait.php index 37148de..72fb142 100644 --- a/vendor/google/auth/src/ServiceAccountSignerTrait.php +++ b/vendor/google/auth/src/ServiceAccountSignerTrait.php @@ -37,7 +37,7 @@ trait ServiceAccountSignerTrait $privateKey = $this->auth->getSigningKey(); $signedString = ''; - if (class_exists('RSA') && !$forceOpenssl) { + if (class_exists('\\phpseclib\\Crypt\\RSA') && !$forceOpenssl) { $rsa = new RSA; $rsa->loadKey($privateKey); $rsa->setSignatureMode(RSA::SIGNATURE_PKCS1); diff --git a/vendor/mobiledetect/mobiledetectlib/Mobile_Detect.json b/vendor/mobiledetect/mobiledetectlib/Mobile_Detect.json index a4361a9..2b807e1 100644 --- a/vendor/mobiledetect/mobiledetectlib/Mobile_Detect.json +++ b/vendor/mobiledetect/mobiledetectlib/Mobile_Detect.json @@ -1 +1 @@ -{"version":"2.8.33","headerMatch":{"HTTP_ACCEPT":{"matches":["application\/x-obml2d","application\/vnd.rim.html","text\/vnd.wap.wml","application\/vnd.wap.xhtml+xml"]},"HTTP_X_WAP_PROFILE":null,"HTTP_X_WAP_CLIENTID":null,"HTTP_WAP_CONNECTION":null,"HTTP_PROFILE":null,"HTTP_X_OPERAMINI_PHONE_UA":null,"HTTP_X_NOKIA_GATEWAY_ID":null,"HTTP_X_ORANGE_ID":null,"HTTP_X_VODAFONE_3GPDPCONTEXT":null,"HTTP_X_HUAWEI_USERID":null,"HTTP_UA_OS":null,"HTTP_X_MOBILE_GATEWAY":null,"HTTP_X_ATT_DEVICEID":null,"HTTP_UA_CPU":{"matches":["ARM"]}},"uaHttpHeaders":["HTTP_USER_AGENT","HTTP_X_OPERAMINI_PHONE_UA","HTTP_X_DEVICE_USER_AGENT","HTTP_X_ORIGINAL_USER_AGENT","HTTP_X_SKYFIRE_PHONE","HTTP_X_BOLT_PHONE_UA","HTTP_DEVICE_STOCK_UA","HTTP_X_UCBROWSER_DEVICE_UA"],"uaMatch":{"phones":{"iPhone":"\\biPhone\\b|\\biPod\\b","BlackBerry":"BlackBerry|\\bBB10\\b|rim[0-9]+","HTC":"HTC|HTC.*(Sensation|Evo|Vision|Explorer|6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT|HD_mini|Sensation.*Z710e|PG86100|Z715e|Desire.*(A8181|HD)|ADR6200|ADR6400L|ADR6425|001HT|Inspire 4G|Android.*\\bEVO\\b|T-Mobile G1|Z520m|Android [0-9.]+; Pixel","Nexus":"Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile|Nexus 4|Nexus 5|Nexus 6","Dell":"Dell[;]? (Streak|Aero|Venue|Venue Pro|Flash|Smoke|Mini 3iX)|XCD28|XCD35|\\b001DL\\b|\\b101DL\\b|\\bGS01\\b","Motorola":"Motorola|DROIDX|DROID BIONIC|\\bDroid\\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925|XT1021|\\bMoto E\\b|XT1068|XT1092|XT1052","Samsung":"\\bSamsung\\b|SM-G950F|SM-G955F|SM-G9250|GT-19300|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750|SM-G9006V|SM-G9008V|SM-G9009D|SM-G900A|SM-G900D|SM-G900F|SM-G900H|SM-G900I|SM-G900J|SM-G900K|SM-G900L|SM-G900M|SM-G900P|SM-G900R4|SM-G900S|SM-G900T|SM-G900V|SM-G900W8|SHV-E160K|SCH-P709|SCH-P729|SM-T2558|GT-I9205|SM-G9350|SM-J120F|SM-G920F|SM-G920V|SM-G930F|SM-N910C|SM-A310F|GT-I9190|SM-J500FN|SM-G903F|SM-J330F","LG":"\\bLG\\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802|MS323|M257)","Sony":"SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i|C5303|C6902|C6903|C6906|C6943|D2533","Asus":"Asus.*Galaxy|PadFone.*Mobile","NokiaLumia":"Lumia [0-9]{3,4}","Micromax":"Micromax.*\\b(A210|A92|A88|A72|A111|A110Q|A115|A116|A110|A90S|A26|A51|A35|A54|A25|A27|A89|A68|A65|A57|A90)\\b","Palm":"PalmSource|Palm","Vertu":"Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature","Pantech":"PANTECH|IM-A850S|IM-A840S|IM-A830L|IM-A830K|IM-A830S|IM-A820L|IM-A810K|IM-A810S|IM-A800S|IM-T100K|IM-A725L|IM-A780L|IM-A775C|IM-A770K|IM-A760S|IM-A750K|IM-A740S|IM-A730S|IM-A720L|IM-A710K|IM-A690L|IM-A690S|IM-A650S|IM-A630K|IM-A600S|VEGA PTL21|PT003|P8010|ADR910L|P6030|P6020|P9070|P4100|P9060|P5000|CDM8992|TXT8045|ADR8995|IS11PT|P2030|P6010|P8000|PT002|IS06|CDM8999|P9050|PT001|TXT8040|P2020|P9020|P2000|P7040|P7000|C790","Fly":"IQ230|IQ444|IQ450|IQ440|IQ442|IQ441|IQ245|IQ256|IQ236|IQ255|IQ235|IQ245|IQ275|IQ240|IQ285|IQ280|IQ270|IQ260|IQ250","Wiko":"KITE 4G|HIGHWAY|GETAWAY|STAIRWAY|DARKSIDE|DARKFULL|DARKNIGHT|DARKMOON|SLIDE|WAX 4G|RAINBOW|BLOOM|SUNSET|GOA(?!nna)|LENNY|BARRY|IGGY|OZZY|CINK FIVE|CINK PEAX|CINK PEAX 2|CINK SLIM|CINK SLIM 2|CINK +|CINK KING|CINK PEAX|CINK SLIM|SUBLIM","iMobile":"i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)","SimValley":"\\b(SP-80|XT-930|SX-340|XT-930|SX-310|SP-360|SP60|SPT-800|SP-120|SPT-800|SP-140|SPX-5|SPX-8|SP-100|SPX-8|SPX-12)\\b","Wolfgang":"AT-B24D|AT-AS50HD|AT-AS40W|AT-AS55HD|AT-AS45q2|AT-B26D|AT-AS50Q","Alcatel":"Alcatel","Nintendo":"Nintendo (3DS|Switch)","Amoi":"Amoi","INQ":"INQ","GenericPhone":"Tapatalk|PDA;|SAGEM|\\bmmp\\b|pocket|\\bpsp\\b|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|\\bwap\\b|nokia|Series40|Series60|S60|SonyEricsson|N900|MAUI.*WAP.*Browser"},"tablets":{"iPad":"iPad|iPad.*Mobile","NexusTablet":"Android.*Nexus[\\s]+(7|9|10)","GoogleTablet":"Android.*Pixel C","SamsungTablet":"SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-T337V|SM-T537V|SM-T707V|SM-T807V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T537A|SM-T707A|SM-T807A|SM-T237|SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-T116BU|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T815|SM-T360|SM-T533|SM-T113|SM-T335|SM-T715|SM-T560|SM-T670|SM-T677|SM-T377|SM-T567|SM-T357T|SM-T555|SM-T561|SM-T713|SM-T719|SM-T813|SM-T819|SM-T580|SM-T355Y?|SM-T280|SM-T817A|SM-T820|SM-W700|SM-P580|SM-T587|SM-P350|SM-P555M|SM-P355M|SM-T113NU|SM-T815Y|SM-T585|SM-T285|SM-T825|SM-W708|SM-T835","Kindle":"Kindle|Silk.*Accelerated|Android.*\\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI|KFARWI|KFFOWI|KFGIWI|KFMEWI)\\b|Android.*Silk\/[0-9.]+ like Chrome\/[0-9.]+ (?!Mobile)","SurfaceTablet":"Windows NT [0-9.]+; ARM;.*(Tablet|ARMBJS)","HPTablet":"HP Slate (7|8|10)|HP ElitePad 900|hp-tablet|EliteBook.*Touch|HP 8|Slate 21|HP SlateBook 10","AsusTablet":"^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\\bK00F\\b|\\bK00C\\b|\\bK00E\\b|\\bK00L\\b|TX201LA|ME176C|ME102A|\\bM80TA\\b|ME372CL|ME560CG|ME372CG|ME302KL| K010 | K011 | K017 | K01E |ME572C|ME103K|ME170C|ME171C|\\bME70C\\b|ME581C|ME581CL|ME8510C|ME181C|P01Y|PO1MA|P01Z|\\bP027\\b|\\bP024\\b|\\bP00C\\b","BlackBerryTablet":"PlayBook|RIM Tablet","HTCtablet":"HTC_Flyer_P512|HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200|PG09410","MotorolaTablet":"xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617","NookTablet":"Android.*Nook|NookColor|nook browser|BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2","AcerTablet":"Android.*; \\b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-811|A1-830)\\b|W3-810|\\bA3-A10\\b|\\bA3-A11\\b|\\bA3-A20\\b|\\bA3-A30","ToshibaTablet":"Android.*(AT100|AT105|AT200|AT205|AT270|AT275|AT300|AT305|AT1S5|AT500|AT570|AT700|AT830)|TOSHIBA.*FOLIO","LGTablet":"\\bL-06C|LG-V909|LG-V900|LG-V700|LG-V510|LG-V500|LG-V410|LG-V400|LG-VK810\\b","FujitsuTablet":"Android.*\\b(F-01D|F-02F|F-05E|F-10D|M532|Q572)\\b","PrestigioTablet":"PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD|PMP812E|PMP812E3G|PMP812F|PMP810E|PMP880TD|PMT3017|PMT3037|PMT3047|PMT3057|PMT7008|PMT5887|PMT5001|PMT5002","LenovoTablet":"Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-850M|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)|TB-X103F|TB-X304F|TB-X304L|TB-8703F|Tab2A7-10F|TB2-X30L","DellTablet":"Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7","YarvikTablet":"Android.*\\b(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468|TAB07-100|TAB07-101|TAB07-150|TAB07-151|TAB07-152|TAB07-200|TAB07-201-3G|TAB07-210|TAB07-211|TAB07-212|TAB07-214|TAB07-220|TAB07-400|TAB07-485|TAB08-150|TAB08-200|TAB08-201-3G|TAB08-201-30|TAB09-100|TAB09-211|TAB09-410|TAB10-150|TAB10-201|TAB10-211|TAB10-400|TAB10-410|TAB13-201|TAB274EUK|TAB275EUK|TAB374EUK|TAB462EUK|TAB474EUK|TAB9-200)\\b","MedionTablet":"Android.*\\bOYO\\b|LIFE.*(P9212|P9514|P9516|S9512)|LIFETAB","ArnovaTablet":"97G4|AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT|AN9G2","IntensoTablet":"INM8002KP|INM1010FP|INM805ND|Intenso Tab|TAB1004","IRUTablet":"M702pro","MegafonTablet":"MegaFon V9|\\bZTE V9\\b|Android.*\\bMT7A\\b","EbodaTablet":"E-Boda (Supreme|Impresspeed|Izzycomm|Essential)","AllViewTablet":"Allview.*(Viva|Alldro|City|Speed|All TV|Frenzy|Quasar|Shine|TX1|AX1|AX2)","ArchosTablet":"\\b(101G9|80G9|A101IT)\\b|Qilive 97R|Archos5|\\bARCHOS (70|79|80|90|97|101|FAMILYPAD|)(b|c|)(G10| Cobalt| TITANIUM(HD|)| Xenon| Neon|XSK| 2| XS 2| PLATINUM| CARBON|GAMEPAD)\\b","AinolTablet":"NOVO7|NOVO8|NOVO10|Novo7Aurora|Novo7Basic|NOVO7PALADIN|novo9-Spark","NokiaLumiaTablet":"Lumia 2520","SonyTablet":"Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551|SGP621|SGP641|SGP612|SOT31|SGP771|SGP611|SGP612|SGP712","PhilipsTablet":"\\b(PI2010|PI3000|PI3100|PI3105|PI3110|PI3205|PI3210|PI3900|PI4010|PI7000|PI7100)\\b","CubeTablet":"Android.*(K8GT|U9GT|U10GT|U16GT|U17GT|U18GT|U19GT|U20GT|U23GT|U30GT)|CUBE U8GT","CobyTablet":"MID1042|MID1045|MID1125|MID1126|MID7012|MID7014|MID7015|MID7034|MID7035|MID7036|MID7042|MID7048|MID7127|MID8042|MID8048|MID8127|MID9042|MID9740|MID9742|MID7022|MID7010","MIDTablet":"M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733|MID4X10","MSITablet":"MSI \\b(Primo 73K|Primo 73L|Primo 81L|Primo 77|Primo 93|Primo 75|Primo 76|Primo 73|Primo 81|Primo 91|Primo 90|Enjoy 71|Enjoy 7|Enjoy 10)\\b","SMiTTablet":"Android.*(\\bMID\\b|MID-560|MTV-T1200|MTV-PND531|MTV-P1101|MTV-PND530)","RockChipTablet":"Android.*(RK2818|RK2808A|RK2918|RK3066)|RK2738|RK2808A","FlyTablet":"IQ310|Fly Vision","bqTablet":"Android.*(bq)?.*(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant|Aquaris ([E|M]10|M8))|Maxwell.*Lite|Maxwell.*Plus","HuaweiTablet":"MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim|M2-A01L|BAH-L09|BAH-W09","NecTablet":"\\bN-06D|\\bN-08D","PantechTablet":"Pantech.*P4100","BronchoTablet":"Broncho.*(N701|N708|N802|a710)","VersusTablet":"TOUCHPAD.*[78910]|\\bTOUCHTAB\\b","ZyncTablet":"z1000|Z99 2G|z99|z930|z999|z990|z909|Z919|z900","PositivoTablet":"TB07STA|TB10STA|TB07FTA|TB10FTA","NabiTablet":"Android.*\\bNabi","KoboTablet":"Kobo Touch|\\bK080\\b|\\bVox\\b Build|\\bArc\\b Build","DanewTablet":"DSlide.*\\b(700|701R|702|703R|704|802|970|971|972|973|974|1010|1012)\\b","TexetTablet":"NaviPad|TB-772A|TM-7045|TM-7055|TM-9750|TM-7016|TM-7024|TM-7026|TM-7041|TM-7043|TM-7047|TM-8041|TM-9741|TM-9747|TM-9748|TM-9751|TM-7022|TM-7021|TM-7020|TM-7011|TM-7010|TM-7023|TM-7025|TM-7037W|TM-7038W|TM-7027W|TM-9720|TM-9725|TM-9737W|TM-1020|TM-9738W|TM-9740|TM-9743W|TB-807A|TB-771A|TB-727A|TB-725A|TB-719A|TB-823A|TB-805A|TB-723A|TB-715A|TB-707A|TB-705A|TB-709A|TB-711A|TB-890HD|TB-880HD|TB-790HD|TB-780HD|TB-770HD|TB-721HD|TB-710HD|TB-434HD|TB-860HD|TB-840HD|TB-760HD|TB-750HD|TB-740HD|TB-730HD|TB-722HD|TB-720HD|TB-700HD|TB-500HD|TB-470HD|TB-431HD|TB-430HD|TB-506|TB-504|TB-446|TB-436|TB-416|TB-146SE|TB-126SE","PlaystationTablet":"Playstation.*(Portable|Vita)","TrekstorTablet":"ST10416-1|VT10416-1|ST70408-1|ST702xx-1|ST702xx-2|ST80208|ST97216|ST70104-2|VT10416-2|ST10216-2A|SurfTab","PyleAudioTablet":"\\b(PTBL10CEU|PTBL10C|PTBL72BC|PTBL72BCEU|PTBL7CEU|PTBL7C|PTBL92BC|PTBL92BCEU|PTBL9CEU|PTBL9CUK|PTBL9C)\\b","AdvanTablet":"Android.* \\b(E3A|T3X|T5C|T5B|T3E|T3C|T3B|T1J|T1F|T2A|T1H|T1i|E1C|T1-E|T5-A|T4|E1-B|T2Ci|T1-B|T1-D|O1-A|E1-A|T1-A|T3A|T4i)\\b ","DanyTechTablet":"Genius Tab G3|Genius Tab S2|Genius Tab Q3|Genius Tab G4|Genius Tab Q4|Genius Tab G-II|Genius TAB GII|Genius TAB GIII|Genius Tab S1","GalapadTablet":"Android.*\\bG1\\b(?!\\))","MicromaxTablet":"Funbook|Micromax.*\\b(P250|P560|P360|P362|P600|P300|P350|P500|P275)\\b","KarbonnTablet":"Android.*\\b(A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2)\\b","AllFineTablet":"Fine7 Genius|Fine7 Shine|Fine7 Air|Fine8 Style|Fine9 More|Fine10 Joy|Fine11 Wide","PROSCANTablet":"\\b(PEM63|PLT1023G|PLT1041|PLT1044|PLT1044G|PLT1091|PLT4311|PLT4311PL|PLT4315|PLT7030|PLT7033|PLT7033D|PLT7035|PLT7035D|PLT7044K|PLT7045K|PLT7045KB|PLT7071KG|PLT7072|PLT7223G|PLT7225G|PLT7777G|PLT7810K|PLT7849G|PLT7851G|PLT7852G|PLT8015|PLT8031|PLT8034|PLT8036|PLT8080K|PLT8082|PLT8088|PLT8223G|PLT8234G|PLT8235G|PLT8816K|PLT9011|PLT9045K|PLT9233G|PLT9735|PLT9760G|PLT9770G)\\b","YONESTablet":"BQ1078|BC1003|BC1077|RK9702|BC9730|BC9001|IT9001|BC7008|BC7010|BC708|BC728|BC7012|BC7030|BC7027|BC7026","ChangJiaTablet":"TPC7102|TPC7103|TPC7105|TPC7106|TPC7107|TPC7201|TPC7203|TPC7205|TPC7210|TPC7708|TPC7709|TPC7712|TPC7110|TPC8101|TPC8103|TPC8105|TPC8106|TPC8203|TPC8205|TPC8503|TPC9106|TPC9701|TPC97101|TPC97103|TPC97105|TPC97106|TPC97111|TPC97113|TPC97203|TPC97603|TPC97809|TPC97205|TPC10101|TPC10103|TPC10106|TPC10111|TPC10203|TPC10205|TPC10503","GUTablet":"TX-A1301|TX-M9002|Q702|kf026","PointOfViewTablet":"TAB-P506|TAB-navi-7-3G-M|TAB-P517|TAB-P-527|TAB-P701|TAB-P703|TAB-P721|TAB-P731N|TAB-P741|TAB-P825|TAB-P905|TAB-P925|TAB-PR945|TAB-PL1015|TAB-P1025|TAB-PI1045|TAB-P1325|TAB-PROTAB[0-9]+|TAB-PROTAB25|TAB-PROTAB26|TAB-PROTAB27|TAB-PROTAB26XL|TAB-PROTAB2-IPS9|TAB-PROTAB30-IPS9|TAB-PROTAB25XXL|TAB-PROTAB26-IPS10|TAB-PROTAB30-IPS10","OvermaxTablet":"OV-(SteelCore|NewBase|Basecore|Baseone|Exellen|Quattor|EduTab|Solution|ACTION|BasicTab|TeddyTab|MagicTab|Stream|TB-08|TB-09)|Qualcore 1027","HCLTablet":"HCL.*Tablet|Connect-3G-2.0|Connect-2G-2.0|ME Tablet U1|ME Tablet U2|ME Tablet G1|ME Tablet X1|ME Tablet Y2|ME Tablet Sync","DPSTablet":"DPS Dream 9|DPS Dual 7","VistureTablet":"V97 HD|i75 3G|Visture V4( HD)?|Visture V5( HD)?|Visture V10","CrestaTablet":"CTP(-)?810|CTP(-)?818|CTP(-)?828|CTP(-)?838|CTP(-)?888|CTP(-)?978|CTP(-)?980|CTP(-)?987|CTP(-)?988|CTP(-)?989","MediatekTablet":"\\bMT8125|MT8389|MT8135|MT8377\\b","ConcordeTablet":"Concorde([ ]+)?Tab|ConCorde ReadMan","GoCleverTablet":"GOCLEVER TAB|A7GOCLEVER|M1042|M7841|M742|R1042BK|R1041|TAB A975|TAB A7842|TAB A741|TAB A741L|TAB M723G|TAB M721|TAB A1021|TAB I921|TAB R721|TAB I720|TAB T76|TAB R70|TAB R76.2|TAB R106|TAB R83.2|TAB M813G|TAB I721|GCTA722|TAB I70|TAB I71|TAB S73|TAB R73|TAB R74|TAB R93|TAB R75|TAB R76.1|TAB A73|TAB A93|TAB A93.2|TAB T72|TAB R83|TAB R974|TAB R973|TAB A101|TAB A103|TAB A104|TAB A104.2|R105BK|M713G|A972BK|TAB A971|TAB R974.2|TAB R104|TAB R83.3|TAB A1042","ModecomTablet":"FreeTAB 9000|FreeTAB 7.4|FreeTAB 7004|FreeTAB 7800|FreeTAB 2096|FreeTAB 7.5|FreeTAB 1014|FreeTAB 1001 |FreeTAB 8001|FreeTAB 9706|FreeTAB 9702|FreeTAB 7003|FreeTAB 7002|FreeTAB 1002|FreeTAB 7801|FreeTAB 1331|FreeTAB 1004|FreeTAB 8002|FreeTAB 8014|FreeTAB 9704|FreeTAB 1003","VoninoTablet":"\\b(Argus[ _]?S|Diamond[ _]?79HD|Emerald[ _]?78E|Luna[ _]?70C|Onyx[ _]?S|Onyx[ _]?Z|Orin[ _]?HD|Orin[ _]?S|Otis[ _]?S|SpeedStar[ _]?S|Magnet[ _]?M9|Primus[ _]?94[ _]?3G|Primus[ _]?94HD|Primus[ _]?QS|Android.*\\bQ8\\b|Sirius[ _]?EVO[ _]?QS|Sirius[ _]?QS|Spirit[ _]?S)\\b","ECSTablet":"V07OT2|TM105A|S10OT1|TR10CS1","StorexTablet":"eZee[_']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab","VodafoneTablet":"SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7|VF-1497","EssentielBTablet":"Smart[ ']?TAB[ ]+?[0-9]+|Family[ ']?TAB2","RossMoorTablet":"RM-790|RM-997|RMD-878G|RMD-974R|RMT-705A|RMT-701|RME-601|RMT-501|RMT-711","iMobileTablet":"i-mobile i-note","TolinoTablet":"tolino tab [0-9.]+|tolino shine","AudioSonicTablet":"\\bC-22Q|T7-QC|T-17B|T-17P\\b","AMPETablet":"Android.* A78 ","SkkTablet":"Android.* (SKYPAD|PHOENIX|CYCLOPS)","TecnoTablet":"TECNO P9|TECNO DP8D","JXDTablet":"Android.* \\b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\\b","iJoyTablet":"Tablet (Spirit 7|Essentia|Galatea|Fusion|Onix 7|Landa|Titan|Scooby|Deox|Stella|Themis|Argon|Unique 7|Sygnus|Hexen|Finity 7|Cream|Cream X2|Jade|Neon 7|Neron 7|Kandy|Scape|Saphyr 7|Rebel|Biox|Rebel|Rebel 8GB|Myst|Draco 7|Myst|Tab7-004|Myst|Tadeo Jones|Tablet Boing|Arrow|Draco Dual Cam|Aurix|Mint|Amity|Revolution|Finity 9|Neon 9|T9w|Amity 4GB Dual Cam|Stone 4GB|Stone 8GB|Andromeda|Silken|X2|Andromeda II|Halley|Flame|Saphyr 9,7|Touch 8|Planet|Triton|Unique 10|Hexen 10|Memphis 4GB|Memphis 8GB|Onix 10)","FX2Tablet":"FX2 PAD7|FX2 PAD10","XoroTablet":"KidsPAD 701|PAD[ ]?712|PAD[ ]?714|PAD[ ]?716|PAD[ ]?717|PAD[ ]?718|PAD[ ]?720|PAD[ ]?721|PAD[ ]?722|PAD[ ]?790|PAD[ ]?792|PAD[ ]?900|PAD[ ]?9715D|PAD[ ]?9716DR|PAD[ ]?9718DR|PAD[ ]?9719QR|PAD[ ]?9720QR|TelePAD1030|Telepad1032|TelePAD730|TelePAD731|TelePAD732|TelePAD735Q|TelePAD830|TelePAD9730|TelePAD795|MegaPAD 1331|MegaPAD 1851|MegaPAD 2151","ViewsonicTablet":"ViewPad 10pi|ViewPad 10e|ViewPad 10s|ViewPad E72|ViewPad7|ViewPad E100|ViewPad 7e|ViewSonic VB733|VB100a","VerizonTablet":"QTAQZ3|QTAIR7|QTAQTZ3|QTASUN1|QTASUN2|QTAXIA1","OdysTablet":"LOOX|XENO10|ODYS[ -](Space|EVO|Xpress|NOON)|\\bXELIO\\b|Xelio10Pro|XELIO7PHONETAB|XELIO10EXTREME|XELIOPT2|NEO_QUAD10","CaptivaTablet":"CAPTIVA PAD","IconbitTablet":"NetTAB|NT-3702|NT-3702S|NT-3702S|NT-3603P|NT-3603P|NT-0704S|NT-0704S|NT-3805C|NT-3805C|NT-0806C|NT-0806C|NT-0909T|NT-0909T|NT-0907S|NT-0907S|NT-0902S|NT-0902S","TeclastTablet":"T98 4G|\\bP80\\b|\\bX90HD\\b|X98 Air|X98 Air 3G|\\bX89\\b|P80 3G|\\bX80h\\b|P98 Air|\\bX89HD\\b|P98 3G|\\bP90HD\\b|P89 3G|X98 3G|\\bP70h\\b|P79HD 3G|G18d 3G|\\bP79HD\\b|\\bP89s\\b|\\bA88\\b|\\bP10HD\\b|\\bP19HD\\b|G18 3G|\\bP78HD\\b|\\bA78\\b|\\bP75\\b|G17s 3G|G17h 3G|\\bP85t\\b|\\bP90\\b|\\bP11\\b|\\bP98t\\b|\\bP98HD\\b|\\bG18d\\b|\\bP85s\\b|\\bP11HD\\b|\\bP88s\\b|\\bA80HD\\b|\\bA80se\\b|\\bA10h\\b|\\bP89\\b|\\bP78s\\b|\\bG18\\b|\\bP85\\b|\\bA70h\\b|\\bA70\\b|\\bG17\\b|\\bP18\\b|\\bA80s\\b|\\bA11s\\b|\\bP88HD\\b|\\bA80h\\b|\\bP76s\\b|\\bP76h\\b|\\bP98\\b|\\bA10HD\\b|\\bP78\\b|\\bP88\\b|\\bA11\\b|\\bA10t\\b|\\bP76a\\b|\\bP76t\\b|\\bP76e\\b|\\bP85HD\\b|\\bP85a\\b|\\bP86\\b|\\bP75HD\\b|\\bP76v\\b|\\bA12\\b|\\bP75a\\b|\\bA15\\b|\\bP76Ti\\b|\\bP81HD\\b|\\bA10\\b|\\bT760VE\\b|\\bT720HD\\b|\\bP76\\b|\\bP73\\b|\\bP71\\b|\\bP72\\b|\\bT720SE\\b|\\bC520Ti\\b|\\bT760\\b|\\bT720VE\\b|T720-3GE|T720-WiFi","OndaTablet":"\\b(V975i|Vi30|VX530|V701|Vi60|V701s|Vi50|V801s|V719|Vx610w|VX610W|V819i|Vi10|VX580W|Vi10|V711s|V813|V811|V820w|V820|Vi20|V711|VI30W|V712|V891w|V972|V819w|V820w|Vi60|V820w|V711|V813s|V801|V819|V975s|V801|V819|V819|V818|V811|V712|V975m|V101w|V961w|V812|V818|V971|V971s|V919|V989|V116w|V102w|V973|Vi40)\\b[\\s]+|V10 \\b4G\\b","JaytechTablet":"TPC-PA762","BlaupunktTablet":"Endeavour 800NG|Endeavour 1010","DigmaTablet":"\\b(iDx10|iDx9|iDx8|iDx7|iDxD7|iDxD8|iDsQ8|iDsQ7|iDsQ8|iDsD10|iDnD7|3TS804H|iDsQ11|iDj7|iDs10)\\b","EvolioTablet":"ARIA_Mini_wifi|Aria[ _]Mini|Evolio X10|Evolio X7|Evolio X8|\\bEvotab\\b|\\bNeura\\b","LavaTablet":"QPAD E704|\\bIvoryS\\b|E-TAB IVORY|\\bE-TAB\\b","AocTablet":"MW0811|MW0812|MW0922|MTK8382|MW1031|MW0831|MW0821|MW0931|MW0712","MpmanTablet":"MP11 OCTA|MP10 OCTA|MPQC1114|MPQC1004|MPQC994|MPQC974|MPQC973|MPQC804|MPQC784|MPQC780|\\bMPG7\\b|MPDCG75|MPDCG71|MPDC1006|MP101DC|MPDC9000|MPDC905|MPDC706HD|MPDC706|MPDC705|MPDC110|MPDC100|MPDC99|MPDC97|MPDC88|MPDC8|MPDC77|MP709|MID701|MID711|MID170|MPDC703|MPQC1010","CelkonTablet":"CT695|CT888|CT[\\s]?910|CT7 Tab|CT9 Tab|CT3 Tab|CT2 Tab|CT1 Tab|C820|C720|\\bCT-1\\b","WolderTablet":"miTab \\b(DIAMOND|SPACE|BROOKLYN|NEO|FLY|MANHATTAN|FUNK|EVOLUTION|SKY|GOCAR|IRON|GENIUS|POP|MINT|EPSILON|BROADWAY|JUMP|HOP|LEGEND|NEW AGE|LINE|ADVANCE|FEEL|FOLLOW|LIKE|LINK|LIVE|THINK|FREEDOM|CHICAGO|CLEVELAND|BALTIMORE-GH|IOWA|BOSTON|SEATTLE|PHOENIX|DALLAS|IN 101|MasterChef)\\b","MediacomTablet":"M-MPI10C3G|M-SP10EG|M-SP10EGP|M-SP10HXAH|M-SP7HXAH|M-SP10HXBH|M-SP8HXAH|M-SP8MXA","MiTablet":"\\bMI PAD\\b|\\bHM NOTE 1W\\b","NibiruTablet":"Nibiru M1|Nibiru Jupiter One","NexoTablet":"NEXO NOVA|NEXO 10|NEXO AVIO|NEXO FREE|NEXO GO|NEXO EVO|NEXO 3G|NEXO SMART|NEXO KIDDO|NEXO MOBI","LeaderTablet":"TBLT10Q|TBLT10I|TBL-10WDKB|TBL-10WDKBO2013|TBL-W230V2|TBL-W450|TBL-W500|SV572|TBLT7I|TBA-AC7-8G|TBLT79|TBL-8W16|TBL-10W32|TBL-10WKB|TBL-W100","UbislateTablet":"UbiSlate[\\s]?7C","PocketBookTablet":"Pocketbook","KocasoTablet":"\\b(TB-1207)\\b","HisenseTablet":"\\b(F5281|E2371)\\b","Hudl":"Hudl HT7S3|Hudl 2","TelstraTablet":"T-Hub2","GenericTablet":"Android.*\\b97D\\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\\bA7EB\\b|CatNova8|A1_07|CT704|CT1002|\\bM721\\b|rk30sdk|\\bEVOTAB\\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\\bM6pro\\b|CT1020W|arc 10HD|\\bTP750\\b|\\bQTAQZ3\\b|WVT101|TM1088|KT107"},"browsers":{"Chrome":"\\bCrMo\\b|CriOS|Android.*Chrome\/[.0-9]* (Mobile)?","Dolfin":"\\bDolfin\\b","Opera":"Opera.*Mini|Opera.*Mobi|Android.*Opera|Mobile.*OPR\/[0-9.]+$|Coast\/[0-9.]+","Skyfire":"Skyfire","Edge":"Mobile Safari\/[.0-9]* Edge","IE":"IEMobile|MSIEMobile","Firefox":"fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile|FxiOS","Bolt":"bolt","TeaShark":"teashark","Blazer":"Blazer","Safari":"Version.*Mobile.*Safari|Safari.*Mobile|MobileSafari","WeChat":"\\bMicroMessenger\\b","UCBrowser":"UC.*Browser|UCWEB","baiduboxapp":"baiduboxapp","baidubrowser":"baidubrowser","DiigoBrowser":"DiigoBrowser","Puffin":"Puffin","Mercury":"\\bMercury\\b","ObigoBrowser":"Obigo","NetFront":"NF-Browser","GenericBrowser":"NokiaBrowser|OviBrowser|OneBrowser|TwonkyBeamBrowser|SEMC.*Browser|FlyFlow|Minimo|NetFront|Novarra-Vision|MQQBrowser|MicroMessenger","PaleMoon":"Android.*PaleMoon|Mobile.*PaleMoon"},"os":{"AndroidOS":"Android","BlackBerryOS":"blackberry|\\bBB10\\b|rim tablet os","PalmOS":"PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino","SymbianOS":"Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\\bS60\\b","WindowsMobileOS":"Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;","WindowsPhoneOS":"Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;","iOS":"\\biPhone.*Mobile|\\biPod|\\biPad|AppleCoreMedia","MeeGoOS":"MeeGo","MaemoOS":"Maemo","JavaOS":"J2ME\/|\\bMIDP\\b|\\bCLDC\\b","webOS":"webOS|hpwOS","badaOS":"\\bBada\\b","BREWOS":"BREW"},"utilities":{"Bot":"Googlebot|facebookexternalhit|AdsBot-Google|Google Keyword Suggestion|Facebot|YandexBot|YandexMobileBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|Exabot|MJ12bot|YandexImages|TurnitinBot|Pingdom","MobileBot":"Googlebot-Mobile|AdsBot-Google-Mobile|YahooSeeker\/M1A1-R2D2","DesktopMode":"WPDesktop","TV":"SonyDTV|HbbTV","WebKit":"(webkit)[ \/]([\\w.]+)","Console":"\\b(Nintendo|Nintendo WiiU|Nintendo 3DS|Nintendo Switch|PLAYSTATION|Xbox)\\b","Watch":"SM-V700"}}} \ No newline at end of file +{"version":"2.8.34","headerMatch":{"HTTP_ACCEPT":{"matches":["application\/x-obml2d","application\/vnd.rim.html","text\/vnd.wap.wml","application\/vnd.wap.xhtml+xml"]},"HTTP_X_WAP_PROFILE":null,"HTTP_X_WAP_CLIENTID":null,"HTTP_WAP_CONNECTION":null,"HTTP_PROFILE":null,"HTTP_X_OPERAMINI_PHONE_UA":null,"HTTP_X_NOKIA_GATEWAY_ID":null,"HTTP_X_ORANGE_ID":null,"HTTP_X_VODAFONE_3GPDPCONTEXT":null,"HTTP_X_HUAWEI_USERID":null,"HTTP_UA_OS":null,"HTTP_X_MOBILE_GATEWAY":null,"HTTP_X_ATT_DEVICEID":null,"HTTP_UA_CPU":{"matches":["ARM"]}},"uaHttpHeaders":["HTTP_USER_AGENT","HTTP_X_OPERAMINI_PHONE_UA","HTTP_X_DEVICE_USER_AGENT","HTTP_X_ORIGINAL_USER_AGENT","HTTP_X_SKYFIRE_PHONE","HTTP_X_BOLT_PHONE_UA","HTTP_DEVICE_STOCK_UA","HTTP_X_UCBROWSER_DEVICE_UA"],"uaMatch":{"phones":{"iPhone":"\\biPhone\\b|\\biPod\\b","BlackBerry":"BlackBerry|\\bBB10\\b|rim[0-9]+|\\b(BBA100|BBB100|BBD100|BBE100|BBF100|STH100)\\b-[0-9]+","HTC":"HTC|HTC.*(Sensation|Evo|Vision|Explorer|6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT|HD_mini|Sensation.*Z710e|PG86100|Z715e|Desire.*(A8181|HD)|ADR6200|ADR6400L|ADR6425|001HT|Inspire 4G|Android.*\\bEVO\\b|T-Mobile G1|Z520m|Android [0-9.]+; Pixel","Nexus":"Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile|Nexus 4|Nexus 5|Nexus 6","Dell":"Dell[;]? (Streak|Aero|Venue|Venue Pro|Flash|Smoke|Mini 3iX)|XCD28|XCD35|\\b001DL\\b|\\b101DL\\b|\\bGS01\\b","Motorola":"Motorola|DROIDX|DROID BIONIC|\\bDroid\\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925|XT1021|\\bMoto E\\b|XT1068|XT1092|XT1052","Samsung":"\\bSamsung\\b|SM-G950F|SM-G955F|SM-G9250|GT-19300|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750|SM-G9006V|SM-G9008V|SM-G9009D|SM-G900A|SM-G900D|SM-G900F|SM-G900H|SM-G900I|SM-G900J|SM-G900K|SM-G900L|SM-G900M|SM-G900P|SM-G900R4|SM-G900S|SM-G900T|SM-G900V|SM-G900W8|SHV-E160K|SCH-P709|SCH-P729|SM-T2558|GT-I9205|SM-G9350|SM-J120F|SM-G920F|SM-G920V|SM-G930F|SM-N910C|SM-A310F|GT-I9190|SM-J500FN|SM-G903F|SM-J330F","LG":"\\bLG\\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802|MS323|M257)|LM-G710","Sony":"SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i|C5303|C6902|C6903|C6906|C6943|D2533","Asus":"Asus.*Galaxy|PadFone.*Mobile","NokiaLumia":"Lumia [0-9]{3,4}","Micromax":"Micromax.*\\b(A210|A92|A88|A72|A111|A110Q|A115|A116|A110|A90S|A26|A51|A35|A54|A25|A27|A89|A68|A65|A57|A90)\\b","Palm":"PalmSource|Palm","Vertu":"Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature","Pantech":"PANTECH|IM-A850S|IM-A840S|IM-A830L|IM-A830K|IM-A830S|IM-A820L|IM-A810K|IM-A810S|IM-A800S|IM-T100K|IM-A725L|IM-A780L|IM-A775C|IM-A770K|IM-A760S|IM-A750K|IM-A740S|IM-A730S|IM-A720L|IM-A710K|IM-A690L|IM-A690S|IM-A650S|IM-A630K|IM-A600S|VEGA PTL21|PT003|P8010|ADR910L|P6030|P6020|P9070|P4100|P9060|P5000|CDM8992|TXT8045|ADR8995|IS11PT|P2030|P6010|P8000|PT002|IS06|CDM8999|P9050|PT001|TXT8040|P2020|P9020|P2000|P7040|P7000|C790","Fly":"IQ230|IQ444|IQ450|IQ440|IQ442|IQ441|IQ245|IQ256|IQ236|IQ255|IQ235|IQ245|IQ275|IQ240|IQ285|IQ280|IQ270|IQ260|IQ250","Wiko":"KITE 4G|HIGHWAY|GETAWAY|STAIRWAY|DARKSIDE|DARKFULL|DARKNIGHT|DARKMOON|SLIDE|WAX 4G|RAINBOW|BLOOM|SUNSET|GOA(?!nna)|LENNY|BARRY|IGGY|OZZY|CINK FIVE|CINK PEAX|CINK PEAX 2|CINK SLIM|CINK SLIM 2|CINK +|CINK KING|CINK PEAX|CINK SLIM|SUBLIM","iMobile":"i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)","SimValley":"\\b(SP-80|XT-930|SX-340|XT-930|SX-310|SP-360|SP60|SPT-800|SP-120|SPT-800|SP-140|SPX-5|SPX-8|SP-100|SPX-8|SPX-12)\\b","Wolfgang":"AT-B24D|AT-AS50HD|AT-AS40W|AT-AS55HD|AT-AS45q2|AT-B26D|AT-AS50Q","Alcatel":"Alcatel","Nintendo":"Nintendo (3DS|Switch)","Amoi":"Amoi","INQ":"INQ","OnePlus":"ONEPLUS","GenericPhone":"Tapatalk|PDA;|SAGEM|\\bmmp\\b|pocket|\\bpsp\\b|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|\\bwap\\b|nokia|Series40|Series60|S60|SonyEricsson|N900|MAUI.*WAP.*Browser"},"tablets":{"iPad":"iPad|iPad.*Mobile","NexusTablet":"Android.*Nexus[\\s]+(7|9|10)","GoogleTablet":"Android.*Pixel C","SamsungTablet":"SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-T337V|SM-T537V|SM-T707V|SM-T807V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T537A|SM-T707A|SM-T807A|SM-T237|SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-T116BU|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T815|SM-T360|SM-T533|SM-T113|SM-T335|SM-T715|SM-T560|SM-T670|SM-T677|SM-T377|SM-T567|SM-T357T|SM-T555|SM-T561|SM-T713|SM-T719|SM-T813|SM-T819|SM-T580|SM-T355Y?|SM-T280|SM-T817A|SM-T820|SM-W700|SM-P580|SM-T587|SM-P350|SM-P555M|SM-P355M|SM-T113NU|SM-T815Y|SM-T585|SM-T285|SM-T825|SM-W708|SM-T835|SM-T830|SM-T837V|SM-T720|SM-T510|SM-T387V","Kindle":"Kindle|Silk.*Accelerated|Android.*\\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI|KFARWI|KFFOWI|KFGIWI|KFMEWI)\\b|Android.*Silk\/[0-9.]+ like Chrome\/[0-9.]+ (?!Mobile)","SurfaceTablet":"Windows NT [0-9.]+; ARM;.*(Tablet|ARMBJS)","HPTablet":"HP Slate (7|8|10)|HP ElitePad 900|hp-tablet|EliteBook.*Touch|HP 8|Slate 21|HP SlateBook 10","AsusTablet":"^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\\bK00F\\b|\\bK00C\\b|\\bK00E\\b|\\bK00L\\b|TX201LA|ME176C|ME102A|\\bM80TA\\b|ME372CL|ME560CG|ME372CG|ME302KL| K010 | K011 | K017 | K01E |ME572C|ME103K|ME170C|ME171C|\\bME70C\\b|ME581C|ME581CL|ME8510C|ME181C|P01Y|PO1MA|P01Z|\\bP027\\b|\\bP024\\b|\\bP00C\\b","BlackBerryTablet":"PlayBook|RIM Tablet","HTCtablet":"HTC_Flyer_P512|HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200|PG09410","MotorolaTablet":"xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617","NookTablet":"Android.*Nook|NookColor|nook browser|BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2","AcerTablet":"Android.*; \\b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-811|A1-830)\\b|W3-810|\\bA3-A10\\b|\\bA3-A11\\b|\\bA3-A20\\b|\\bA3-A30","ToshibaTablet":"Android.*(AT100|AT105|AT200|AT205|AT270|AT275|AT300|AT305|AT1S5|AT500|AT570|AT700|AT830)|TOSHIBA.*FOLIO","LGTablet":"\\bL-06C|LG-V909|LG-V900|LG-V700|LG-V510|LG-V500|LG-V410|LG-V400|LG-VK810\\b","FujitsuTablet":"Android.*\\b(F-01D|F-02F|F-05E|F-10D|M532|Q572)\\b","PrestigioTablet":"PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD|PMP812E|PMP812E3G|PMP812F|PMP810E|PMP880TD|PMT3017|PMT3037|PMT3047|PMT3057|PMT7008|PMT5887|PMT5001|PMT5002","LenovoTablet":"Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-850M|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)|TB-X103F|TB-X304X|TB-X304F|TB-X304L|TB-X505F|TB-X505L|TB-X505X|TB-X605F|TB-X605L|TB-8703F|TB-8703X|TB-8703N|TB-8704N|TB-8704F|TB-8704X|TB-8704V|TB-7304F|TB-7304I|TB-7304X|Tab2A7-10F|Tab2A7-20F|TB2-X30L|YT3-X50L|YT3-X50F|YT3-X50M|YT-X705F|YT-X703F|YT-X703L|YT-X705L|YT-X705X|TB2-X30F|TB2-X30L|TB2-X30M|A2107A-F|A2107A-H|TB3-730F|TB3-730M|TB3-730X|TB-7504F|TB-7504X","DellTablet":"Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7","YarvikTablet":"Android.*\\b(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468|TAB07-100|TAB07-101|TAB07-150|TAB07-151|TAB07-152|TAB07-200|TAB07-201-3G|TAB07-210|TAB07-211|TAB07-212|TAB07-214|TAB07-220|TAB07-400|TAB07-485|TAB08-150|TAB08-200|TAB08-201-3G|TAB08-201-30|TAB09-100|TAB09-211|TAB09-410|TAB10-150|TAB10-201|TAB10-211|TAB10-400|TAB10-410|TAB13-201|TAB274EUK|TAB275EUK|TAB374EUK|TAB462EUK|TAB474EUK|TAB9-200)\\b","MedionTablet":"Android.*\\bOYO\\b|LIFE.*(P9212|P9514|P9516|S9512)|LIFETAB","ArnovaTablet":"97G4|AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT|AN9G2","IntensoTablet":"INM8002KP|INM1010FP|INM805ND|Intenso Tab|TAB1004","IRUTablet":"M702pro","MegafonTablet":"MegaFon V9|\\bZTE V9\\b|Android.*\\bMT7A\\b","EbodaTablet":"E-Boda (Supreme|Impresspeed|Izzycomm|Essential)","AllViewTablet":"Allview.*(Viva|Alldro|City|Speed|All TV|Frenzy|Quasar|Shine|TX1|AX1|AX2)","ArchosTablet":"\\b(101G9|80G9|A101IT)\\b|Qilive 97R|Archos5|\\bARCHOS (70|79|80|90|97|101|FAMILYPAD|)(b|c|)(G10| Cobalt| TITANIUM(HD|)| Xenon| Neon|XSK| 2| XS 2| PLATINUM| CARBON|GAMEPAD)\\b","AinolTablet":"NOVO7|NOVO8|NOVO10|Novo7Aurora|Novo7Basic|NOVO7PALADIN|novo9-Spark","NokiaLumiaTablet":"Lumia 2520","SonyTablet":"Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551|SGP621|SGP641|SGP612|SOT31|SGP771|SGP611|SGP612|SGP712","PhilipsTablet":"\\b(PI2010|PI3000|PI3100|PI3105|PI3110|PI3205|PI3210|PI3900|PI4010|PI7000|PI7100)\\b","CubeTablet":"Android.*(K8GT|U9GT|U10GT|U16GT|U17GT|U18GT|U19GT|U20GT|U23GT|U30GT)|CUBE U8GT","CobyTablet":"MID1042|MID1045|MID1125|MID1126|MID7012|MID7014|MID7015|MID7034|MID7035|MID7036|MID7042|MID7048|MID7127|MID8042|MID8048|MID8127|MID9042|MID9740|MID9742|MID7022|MID7010","MIDTablet":"M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733|MID4X10","MSITablet":"MSI \\b(Primo 73K|Primo 73L|Primo 81L|Primo 77|Primo 93|Primo 75|Primo 76|Primo 73|Primo 81|Primo 91|Primo 90|Enjoy 71|Enjoy 7|Enjoy 10)\\b","SMiTTablet":"Android.*(\\bMID\\b|MID-560|MTV-T1200|MTV-PND531|MTV-P1101|MTV-PND530)","RockChipTablet":"Android.*(RK2818|RK2808A|RK2918|RK3066)|RK2738|RK2808A","FlyTablet":"IQ310|Fly Vision","bqTablet":"Android.*(bq)?.*\\b(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant|Aquaris ([E|M]10|M8))\\b|Maxwell.*Lite|Maxwell.*Plus","HuaweiTablet":"MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim|M2-A01L|BAH-L09|BAH-W09|AGS-L09|CMR-AL19","NecTablet":"\\bN-06D|\\bN-08D","PantechTablet":"Pantech.*P4100","BronchoTablet":"Broncho.*(N701|N708|N802|a710)","VersusTablet":"TOUCHPAD.*[78910]|\\bTOUCHTAB\\b","ZyncTablet":"z1000|Z99 2G|z930|z990|z909|Z919|z900","PositivoTablet":"TB07STA|TB10STA|TB07FTA|TB10FTA","NabiTablet":"Android.*\\bNabi","KoboTablet":"Kobo Touch|\\bK080\\b|\\bVox\\b Build|\\bArc\\b Build","DanewTablet":"DSlide.*\\b(700|701R|702|703R|704|802|970|971|972|973|974|1010|1012)\\b","TexetTablet":"NaviPad|TB-772A|TM-7045|TM-7055|TM-9750|TM-7016|TM-7024|TM-7026|TM-7041|TM-7043|TM-7047|TM-8041|TM-9741|TM-9747|TM-9748|TM-9751|TM-7022|TM-7021|TM-7020|TM-7011|TM-7010|TM-7023|TM-7025|TM-7037W|TM-7038W|TM-7027W|TM-9720|TM-9725|TM-9737W|TM-1020|TM-9738W|TM-9740|TM-9743W|TB-807A|TB-771A|TB-727A|TB-725A|TB-719A|TB-823A|TB-805A|TB-723A|TB-715A|TB-707A|TB-705A|TB-709A|TB-711A|TB-890HD|TB-880HD|TB-790HD|TB-780HD|TB-770HD|TB-721HD|TB-710HD|TB-434HD|TB-860HD|TB-840HD|TB-760HD|TB-750HD|TB-740HD|TB-730HD|TB-722HD|TB-720HD|TB-700HD|TB-500HD|TB-470HD|TB-431HD|TB-430HD|TB-506|TB-504|TB-446|TB-436|TB-416|TB-146SE|TB-126SE","PlaystationTablet":"Playstation.*(Portable|Vita)","TrekstorTablet":"ST10416-1|VT10416-1|ST70408-1|ST702xx-1|ST702xx-2|ST80208|ST97216|ST70104-2|VT10416-2|ST10216-2A|SurfTab","PyleAudioTablet":"\\b(PTBL10CEU|PTBL10C|PTBL72BC|PTBL72BCEU|PTBL7CEU|PTBL7C|PTBL92BC|PTBL92BCEU|PTBL9CEU|PTBL9CUK|PTBL9C)\\b","AdvanTablet":"Android.* \\b(E3A|T3X|T5C|T5B|T3E|T3C|T3B|T1J|T1F|T2A|T1H|T1i|E1C|T1-E|T5-A|T4|E1-B|T2Ci|T1-B|T1-D|O1-A|E1-A|T1-A|T3A|T4i)\\b ","DanyTechTablet":"Genius Tab G3|Genius Tab S2|Genius Tab Q3|Genius Tab G4|Genius Tab Q4|Genius Tab G-II|Genius TAB GII|Genius TAB GIII|Genius Tab S1","GalapadTablet":"Android.*\\bG1\\b(?!\\))","MicromaxTablet":"Funbook|Micromax.*\\b(P250|P560|P360|P362|P600|P300|P350|P500|P275)\\b","KarbonnTablet":"Android.*\\b(A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2)\\b","AllFineTablet":"Fine7 Genius|Fine7 Shine|Fine7 Air|Fine8 Style|Fine9 More|Fine10 Joy|Fine11 Wide","PROSCANTablet":"\\b(PEM63|PLT1023G|PLT1041|PLT1044|PLT1044G|PLT1091|PLT4311|PLT4311PL|PLT4315|PLT7030|PLT7033|PLT7033D|PLT7035|PLT7035D|PLT7044K|PLT7045K|PLT7045KB|PLT7071KG|PLT7072|PLT7223G|PLT7225G|PLT7777G|PLT7810K|PLT7849G|PLT7851G|PLT7852G|PLT8015|PLT8031|PLT8034|PLT8036|PLT8080K|PLT8082|PLT8088|PLT8223G|PLT8234G|PLT8235G|PLT8816K|PLT9011|PLT9045K|PLT9233G|PLT9735|PLT9760G|PLT9770G)\\b","YONESTablet":"BQ1078|BC1003|BC1077|RK9702|BC9730|BC9001|IT9001|BC7008|BC7010|BC708|BC728|BC7012|BC7030|BC7027|BC7026","ChangJiaTablet":"TPC7102|TPC7103|TPC7105|TPC7106|TPC7107|TPC7201|TPC7203|TPC7205|TPC7210|TPC7708|TPC7709|TPC7712|TPC7110|TPC8101|TPC8103|TPC8105|TPC8106|TPC8203|TPC8205|TPC8503|TPC9106|TPC9701|TPC97101|TPC97103|TPC97105|TPC97106|TPC97111|TPC97113|TPC97203|TPC97603|TPC97809|TPC97205|TPC10101|TPC10103|TPC10106|TPC10111|TPC10203|TPC10205|TPC10503","GUTablet":"TX-A1301|TX-M9002|Q702|kf026","PointOfViewTablet":"TAB-P506|TAB-navi-7-3G-M|TAB-P517|TAB-P-527|TAB-P701|TAB-P703|TAB-P721|TAB-P731N|TAB-P741|TAB-P825|TAB-P905|TAB-P925|TAB-PR945|TAB-PL1015|TAB-P1025|TAB-PI1045|TAB-P1325|TAB-PROTAB[0-9]+|TAB-PROTAB25|TAB-PROTAB26|TAB-PROTAB27|TAB-PROTAB26XL|TAB-PROTAB2-IPS9|TAB-PROTAB30-IPS9|TAB-PROTAB25XXL|TAB-PROTAB26-IPS10|TAB-PROTAB30-IPS10","OvermaxTablet":"OV-(SteelCore|NewBase|Basecore|Baseone|Exellen|Quattor|EduTab|Solution|ACTION|BasicTab|TeddyTab|MagicTab|Stream|TB-08|TB-09)|Qualcore 1027","HCLTablet":"HCL.*Tablet|Connect-3G-2.0|Connect-2G-2.0|ME Tablet U1|ME Tablet U2|ME Tablet G1|ME Tablet X1|ME Tablet Y2|ME Tablet Sync","DPSTablet":"DPS Dream 9|DPS Dual 7","VistureTablet":"V97 HD|i75 3G|Visture V4( HD)?|Visture V5( HD)?|Visture V10","CrestaTablet":"CTP(-)?810|CTP(-)?818|CTP(-)?828|CTP(-)?838|CTP(-)?888|CTP(-)?978|CTP(-)?980|CTP(-)?987|CTP(-)?988|CTP(-)?989","MediatekTablet":"\\bMT8125|MT8389|MT8135|MT8377\\b","ConcordeTablet":"Concorde([ ]+)?Tab|ConCorde ReadMan","GoCleverTablet":"GOCLEVER TAB|A7GOCLEVER|M1042|M7841|M742|R1042BK|R1041|TAB A975|TAB A7842|TAB A741|TAB A741L|TAB M723G|TAB M721|TAB A1021|TAB I921|TAB R721|TAB I720|TAB T76|TAB R70|TAB R76.2|TAB R106|TAB R83.2|TAB M813G|TAB I721|GCTA722|TAB I70|TAB I71|TAB S73|TAB R73|TAB R74|TAB R93|TAB R75|TAB R76.1|TAB A73|TAB A93|TAB A93.2|TAB T72|TAB R83|TAB R974|TAB R973|TAB A101|TAB A103|TAB A104|TAB A104.2|R105BK|M713G|A972BK|TAB A971|TAB R974.2|TAB R104|TAB R83.3|TAB A1042","ModecomTablet":"FreeTAB 9000|FreeTAB 7.4|FreeTAB 7004|FreeTAB 7800|FreeTAB 2096|FreeTAB 7.5|FreeTAB 1014|FreeTAB 1001 |FreeTAB 8001|FreeTAB 9706|FreeTAB 9702|FreeTAB 7003|FreeTAB 7002|FreeTAB 1002|FreeTAB 7801|FreeTAB 1331|FreeTAB 1004|FreeTAB 8002|FreeTAB 8014|FreeTAB 9704|FreeTAB 1003","VoninoTablet":"\\b(Argus[ _]?S|Diamond[ _]?79HD|Emerald[ _]?78E|Luna[ _]?70C|Onyx[ _]?S|Onyx[ _]?Z|Orin[ _]?HD|Orin[ _]?S|Otis[ _]?S|SpeedStar[ _]?S|Magnet[ _]?M9|Primus[ _]?94[ _]?3G|Primus[ _]?94HD|Primus[ _]?QS|Android.*\\bQ8\\b|Sirius[ _]?EVO[ _]?QS|Sirius[ _]?QS|Spirit[ _]?S)\\b","ECSTablet":"V07OT2|TM105A|S10OT1|TR10CS1","StorexTablet":"eZee[_']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab","VodafoneTablet":"SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7|VF-1497|VFD 1400","EssentielBTablet":"Smart[ ']?TAB[ ]+?[0-9]+|Family[ ']?TAB2","RossMoorTablet":"RM-790|RM-997|RMD-878G|RMD-974R|RMT-705A|RMT-701|RME-601|RMT-501|RMT-711","iMobileTablet":"i-mobile i-note","TolinoTablet":"tolino tab [0-9.]+|tolino shine","AudioSonicTablet":"\\bC-22Q|T7-QC|T-17B|T-17P\\b","AMPETablet":"Android.* A78 ","SkkTablet":"Android.* (SKYPAD|PHOENIX|CYCLOPS)","TecnoTablet":"TECNO P9|TECNO DP8D","JXDTablet":"Android.* \\b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\\b","iJoyTablet":"Tablet (Spirit 7|Essentia|Galatea|Fusion|Onix 7|Landa|Titan|Scooby|Deox|Stella|Themis|Argon|Unique 7|Sygnus|Hexen|Finity 7|Cream|Cream X2|Jade|Neon 7|Neron 7|Kandy|Scape|Saphyr 7|Rebel|Biox|Rebel|Rebel 8GB|Myst|Draco 7|Myst|Tab7-004|Myst|Tadeo Jones|Tablet Boing|Arrow|Draco Dual Cam|Aurix|Mint|Amity|Revolution|Finity 9|Neon 9|T9w|Amity 4GB Dual Cam|Stone 4GB|Stone 8GB|Andromeda|Silken|X2|Andromeda II|Halley|Flame|Saphyr 9,7|Touch 8|Planet|Triton|Unique 10|Hexen 10|Memphis 4GB|Memphis 8GB|Onix 10)","FX2Tablet":"FX2 PAD7|FX2 PAD10","XoroTablet":"KidsPAD 701|PAD[ ]?712|PAD[ ]?714|PAD[ ]?716|PAD[ ]?717|PAD[ ]?718|PAD[ ]?720|PAD[ ]?721|PAD[ ]?722|PAD[ ]?790|PAD[ ]?792|PAD[ ]?900|PAD[ ]?9715D|PAD[ ]?9716DR|PAD[ ]?9718DR|PAD[ ]?9719QR|PAD[ ]?9720QR|TelePAD1030|Telepad1032|TelePAD730|TelePAD731|TelePAD732|TelePAD735Q|TelePAD830|TelePAD9730|TelePAD795|MegaPAD 1331|MegaPAD 1851|MegaPAD 2151","ViewsonicTablet":"ViewPad 10pi|ViewPad 10e|ViewPad 10s|ViewPad E72|ViewPad7|ViewPad E100|ViewPad 7e|ViewSonic VB733|VB100a","VerizonTablet":"QTAQZ3|QTAIR7|QTAQTZ3|QTASUN1|QTASUN2|QTAXIA1","OdysTablet":"LOOX|XENO10|ODYS[ -](Space|EVO|Xpress|NOON)|\\bXELIO\\b|Xelio10Pro|XELIO7PHONETAB|XELIO10EXTREME|XELIOPT2|NEO_QUAD10","CaptivaTablet":"CAPTIVA PAD","IconbitTablet":"NetTAB|NT-3702|NT-3702S|NT-3702S|NT-3603P|NT-3603P|NT-0704S|NT-0704S|NT-3805C|NT-3805C|NT-0806C|NT-0806C|NT-0909T|NT-0909T|NT-0907S|NT-0907S|NT-0902S|NT-0902S","TeclastTablet":"T98 4G|\\bP80\\b|\\bX90HD\\b|X98 Air|X98 Air 3G|\\bX89\\b|P80 3G|\\bX80h\\b|P98 Air|\\bX89HD\\b|P98 3G|\\bP90HD\\b|P89 3G|X98 3G|\\bP70h\\b|P79HD 3G|G18d 3G|\\bP79HD\\b|\\bP89s\\b|\\bA88\\b|\\bP10HD\\b|\\bP19HD\\b|G18 3G|\\bP78HD\\b|\\bA78\\b|\\bP75\\b|G17s 3G|G17h 3G|\\bP85t\\b|\\bP90\\b|\\bP11\\b|\\bP98t\\b|\\bP98HD\\b|\\bG18d\\b|\\bP85s\\b|\\bP11HD\\b|\\bP88s\\b|\\bA80HD\\b|\\bA80se\\b|\\bA10h\\b|\\bP89\\b|\\bP78s\\b|\\bG18\\b|\\bP85\\b|\\bA70h\\b|\\bA70\\b|\\bG17\\b|\\bP18\\b|\\bA80s\\b|\\bA11s\\b|\\bP88HD\\b|\\bA80h\\b|\\bP76s\\b|\\bP76h\\b|\\bP98\\b|\\bA10HD\\b|\\bP78\\b|\\bP88\\b|\\bA11\\b|\\bA10t\\b|\\bP76a\\b|\\bP76t\\b|\\bP76e\\b|\\bP85HD\\b|\\bP85a\\b|\\bP86\\b|\\bP75HD\\b|\\bP76v\\b|\\bA12\\b|\\bP75a\\b|\\bA15\\b|\\bP76Ti\\b|\\bP81HD\\b|\\bA10\\b|\\bT760VE\\b|\\bT720HD\\b|\\bP76\\b|\\bP73\\b|\\bP71\\b|\\bP72\\b|\\bT720SE\\b|\\bC520Ti\\b|\\bT760\\b|\\bT720VE\\b|T720-3GE|T720-WiFi","OndaTablet":"\\b(V975i|Vi30|VX530|V701|Vi60|V701s|Vi50|V801s|V719|Vx610w|VX610W|V819i|Vi10|VX580W|Vi10|V711s|V813|V811|V820w|V820|Vi20|V711|VI30W|V712|V891w|V972|V819w|V820w|Vi60|V820w|V711|V813s|V801|V819|V975s|V801|V819|V819|V818|V811|V712|V975m|V101w|V961w|V812|V818|V971|V971s|V919|V989|V116w|V102w|V973|Vi40)\\b[\\s]+|V10 \\b4G\\b","JaytechTablet":"TPC-PA762","BlaupunktTablet":"Endeavour 800NG|Endeavour 1010","DigmaTablet":"\\b(iDx10|iDx9|iDx8|iDx7|iDxD7|iDxD8|iDsQ8|iDsQ7|iDsQ8|iDsD10|iDnD7|3TS804H|iDsQ11|iDj7|iDs10)\\b","EvolioTablet":"ARIA_Mini_wifi|Aria[ _]Mini|Evolio X10|Evolio X7|Evolio X8|\\bEvotab\\b|\\bNeura\\b","LavaTablet":"QPAD E704|\\bIvoryS\\b|E-TAB IVORY|\\bE-TAB\\b","AocTablet":"MW0811|MW0812|MW0922|MTK8382|MW1031|MW0831|MW0821|MW0931|MW0712","MpmanTablet":"MP11 OCTA|MP10 OCTA|MPQC1114|MPQC1004|MPQC994|MPQC974|MPQC973|MPQC804|MPQC784|MPQC780|\\bMPG7\\b|MPDCG75|MPDCG71|MPDC1006|MP101DC|MPDC9000|MPDC905|MPDC706HD|MPDC706|MPDC705|MPDC110|MPDC100|MPDC99|MPDC97|MPDC88|MPDC8|MPDC77|MP709|MID701|MID711|MID170|MPDC703|MPQC1010","CelkonTablet":"CT695|CT888|CT[\\s]?910|CT7 Tab|CT9 Tab|CT3 Tab|CT2 Tab|CT1 Tab|C820|C720|\\bCT-1\\b","WolderTablet":"miTab \\b(DIAMOND|SPACE|BROOKLYN|NEO|FLY|MANHATTAN|FUNK|EVOLUTION|SKY|GOCAR|IRON|GENIUS|POP|MINT|EPSILON|BROADWAY|JUMP|HOP|LEGEND|NEW AGE|LINE|ADVANCE|FEEL|FOLLOW|LIKE|LINK|LIVE|THINK|FREEDOM|CHICAGO|CLEVELAND|BALTIMORE-GH|IOWA|BOSTON|SEATTLE|PHOENIX|DALLAS|IN 101|MasterChef)\\b","MediacomTablet":"M-MPI10C3G|M-SP10EG|M-SP10EGP|M-SP10HXAH|M-SP7HXAH|M-SP10HXBH|M-SP8HXAH|M-SP8MXA","MiTablet":"\\bMI PAD\\b|\\bHM NOTE 1W\\b","NibiruTablet":"Nibiru M1|Nibiru Jupiter One","NexoTablet":"NEXO NOVA|NEXO 10|NEXO AVIO|NEXO FREE|NEXO GO|NEXO EVO|NEXO 3G|NEXO SMART|NEXO KIDDO|NEXO MOBI","LeaderTablet":"TBLT10Q|TBLT10I|TBL-10WDKB|TBL-10WDKBO2013|TBL-W230V2|TBL-W450|TBL-W500|SV572|TBLT7I|TBA-AC7-8G|TBLT79|TBL-8W16|TBL-10W32|TBL-10WKB|TBL-W100","UbislateTablet":"UbiSlate[\\s]?7C","PocketBookTablet":"Pocketbook","KocasoTablet":"\\b(TB-1207)\\b","HisenseTablet":"\\b(F5281|E2371)\\b","Hudl":"Hudl HT7S3|Hudl 2","TelstraTablet":"T-Hub2","GenericTablet":"Android.*\\b97D\\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\\bA7EB\\b|CatNova8|A1_07|CT704|CT1002|\\bM721\\b|rk30sdk|\\bEVOTAB\\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\\bM6pro\\b|CT1020W|arc 10HD|\\bTP750\\b|\\bQTAQZ3\\b|WVT101|TM1088|KT107"},"browsers":{"Chrome":"\\bCrMo\\b|CriOS|Android.*Chrome\/[.0-9]* (Mobile)?","Dolfin":"\\bDolfin\\b","Opera":"Opera.*Mini|Opera.*Mobi|Android.*Opera|Mobile.*OPR\/[0-9.]+$|Coast\/[0-9.]+","Skyfire":"Skyfire","Edge":"Mobile Safari\/[.0-9]* Edge","IE":"IEMobile|MSIEMobile","Firefox":"fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile|FxiOS","Bolt":"bolt","TeaShark":"teashark","Blazer":"Blazer","Safari":"Version.*Mobile.*Safari|Safari.*Mobile|MobileSafari","WeChat":"\\bMicroMessenger\\b","UCBrowser":"UC.*Browser|UCWEB","baiduboxapp":"baiduboxapp","baidubrowser":"baidubrowser","DiigoBrowser":"DiigoBrowser","Mercury":"\\bMercury\\b","ObigoBrowser":"Obigo","NetFront":"NF-Browser","GenericBrowser":"NokiaBrowser|OviBrowser|OneBrowser|TwonkyBeamBrowser|SEMC.*Browser|FlyFlow|Minimo|NetFront|Novarra-Vision|MQQBrowser|MicroMessenger","PaleMoon":"Android.*PaleMoon|Mobile.*PaleMoon"},"os":{"AndroidOS":"Android","BlackBerryOS":"blackberry|\\bBB10\\b|rim tablet os","PalmOS":"PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino","SymbianOS":"Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\\bS60\\b","WindowsMobileOS":"Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Windows Mobile|Windows Phone [0-9.]+|WCE;","WindowsPhoneOS":"Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;","iOS":"\\biPhone.*Mobile|\\biPod|\\biPad|AppleCoreMedia","iPadOS":"CPU OS 13","MeeGoOS":"MeeGo","MaemoOS":"Maemo","JavaOS":"J2ME\/|\\bMIDP\\b|\\bCLDC\\b","webOS":"webOS|hpwOS","badaOS":"\\bBada\\b","BREWOS":"BREW"},"utilities":{"Bot":"Googlebot|facebookexternalhit|Google-AMPHTML|s~amp-validator|AdsBot-Google|Google Keyword Suggestion|Facebot|YandexBot|YandexMobileBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|Exabot|MJ12bot|YandexImages|TurnitinBot|Pingdom|contentkingapp","MobileBot":"Googlebot-Mobile|AdsBot-Google-Mobile|YahooSeeker\/M1A1-R2D2","DesktopMode":"WPDesktop","TV":"SonyDTV|HbbTV","WebKit":"(webkit)[ \/]([\\w.]+)","Console":"\\b(Nintendo|Nintendo WiiU|Nintendo 3DS|Nintendo Switch|PLAYSTATION|Xbox)\\b","Watch":"SM-V700"}}} \ No newline at end of file diff --git a/vendor/mobiledetect/mobiledetectlib/Mobile_Detect.php b/vendor/mobiledetect/mobiledetectlib/Mobile_Detect.php index c65b381..b105eb7 100644 --- a/vendor/mobiledetect/mobiledetectlib/Mobile_Detect.php +++ b/vendor/mobiledetect/mobiledetectlib/Mobile_Detect.php @@ -18,7 +18,7 @@ * @author Nick Ilyin * Original author: Victor Stanciu * - * @version 2.8.33 + * @version 2.8.34 */ class Mobile_Detect { @@ -61,7 +61,7 @@ class Mobile_Detect /** * Stores the version number of the current release. */ - const VERSION = '2.8.33'; + const VERSION = '2.8.34'; /** * A type for the version() method indicating a string return value. @@ -164,14 +164,14 @@ class Mobile_Detect */ protected static $phoneDevices = array( 'iPhone' => '\biPhone\b|\biPod\b', // |\biTunes - 'BlackBerry' => 'BlackBerry|\bBB10\b|rim[0-9]+', + 'BlackBerry' => 'BlackBerry|\bBB10\b|rim[0-9]+|\b(BBA100|BBB100|BBD100|BBE100|BBF100|STH100)\b-[0-9]+', 'HTC' => 'HTC|HTC.*(Sensation|Evo|Vision|Explorer|6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT|HD_mini|Sensation.*Z710e|PG86100|Z715e|Desire.*(A8181|HD)|ADR6200|ADR6400L|ADR6425|001HT|Inspire 4G|Android.*\bEVO\b|T-Mobile G1|Z520m|Android [0-9.]+; Pixel', 'Nexus' => 'Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile|Nexus 4|Nexus 5|Nexus 6', // @todo: Is 'Dell Streak' a tablet or a phone? ;) 'Dell' => 'Dell[;]? (Streak|Aero|Venue|Venue Pro|Flash|Smoke|Mini 3iX)|XCD28|XCD35|\b001DL\b|\b101DL\b|\bGS01\b', 'Motorola' => 'Motorola|DROIDX|DROID BIONIC|\bDroid\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925|XT1021|\bMoto E\b|XT1068|XT1092|XT1052', 'Samsung' => '\bSamsung\b|SM-G950F|SM-G955F|SM-G9250|GT-19300|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750|SM-G9006V|SM-G9008V|SM-G9009D|SM-G900A|SM-G900D|SM-G900F|SM-G900H|SM-G900I|SM-G900J|SM-G900K|SM-G900L|SM-G900M|SM-G900P|SM-G900R4|SM-G900S|SM-G900T|SM-G900V|SM-G900W8|SHV-E160K|SCH-P709|SCH-P729|SM-T2558|GT-I9205|SM-G9350|SM-J120F|SM-G920F|SM-G920V|SM-G930F|SM-N910C|SM-A310F|GT-I9190|SM-J500FN|SM-G903F|SM-J330F', - 'LG' => '\bLG\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802|MS323|M257)', + 'LG' => '\bLG\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802|MS323|M257)|LM-G710', 'Sony' => 'SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i|C5303|C6902|C6903|C6906|C6943|D2533', 'Asus' => 'Asus.*Galaxy|PadFone.*Mobile', 'NokiaLumia' => 'Lumia [0-9]{3,4}', @@ -201,6 +201,7 @@ class Mobile_Detect 'Amoi' => 'Amoi', // http://en.wikipedia.org/wiki/INQ 'INQ' => 'INQ', + 'OnePlus' => 'ONEPLUS', // @Tapatalk is a mobile app; http://support.tapatalk.com/threads/smf-2-0-2-os-and-browser-detection-plugin-and-tapatalk.15565/#post-79039 'GenericPhone' => 'Tapatalk|PDA;|SAGEM|\bmmp\b|pocket|\bpsp\b|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|\bwap\b|nokia|Series40|Series60|S60|SonyEricsson|N900|MAUI.*WAP.*Browser', ); @@ -219,7 +220,7 @@ class Mobile_Detect 'NexusTablet' => 'Android.*Nexus[\s]+(7|9|10)', // https://en.wikipedia.org/wiki/Pixel_C 'GoogleTablet' => 'Android.*Pixel C', - 'SamsungTablet' => 'SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-T337V|SM-T537V|SM-T707V|SM-T807V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T537A|SM-T707A|SM-T807A|SM-T237|SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-T116BU|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T815|SM-T360|SM-T533|SM-T113|SM-T335|SM-T715|SM-T560|SM-T670|SM-T677|SM-T377|SM-T567|SM-T357T|SM-T555|SM-T561|SM-T713|SM-T719|SM-T813|SM-T819|SM-T580|SM-T355Y?|SM-T280|SM-T817A|SM-T820|SM-W700|SM-P580|SM-T587|SM-P350|SM-P555M|SM-P355M|SM-T113NU|SM-T815Y|SM-T585|SM-T285|SM-T825|SM-W708|SM-T835', // SCH-P709|SCH-P729|SM-T2558|GT-I9205 - Samsung Mega - treat them like a regular phone. + 'SamsungTablet' => 'SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-T337V|SM-T537V|SM-T707V|SM-T807V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T537A|SM-T707A|SM-T807A|SM-T237|SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-T116BU|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T815|SM-T360|SM-T533|SM-T113|SM-T335|SM-T715|SM-T560|SM-T670|SM-T677|SM-T377|SM-T567|SM-T357T|SM-T555|SM-T561|SM-T713|SM-T719|SM-T813|SM-T819|SM-T580|SM-T355Y?|SM-T280|SM-T817A|SM-T820|SM-W700|SM-P580|SM-T587|SM-P350|SM-P555M|SM-P355M|SM-T113NU|SM-T815Y|SM-T585|SM-T285|SM-T825|SM-W708|SM-T835|SM-T830|SM-T837V|SM-T720|SM-T510|SM-T387V', // SCH-P709|SCH-P729|SM-T2558|GT-I9205 - Samsung Mega - treat them like a regular phone. // http://docs.aws.amazon.com/silk/latest/developerguide/user-agent.html 'Kindle' => 'Kindle|Silk.*Accelerated|Android.*\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI|KFARWI|KFFOWI|KFGIWI|KFMEWI)\b|Android.*Silk/[0-9.]+ like Chrome/[0-9.]+ (?!Mobile)', // Only the Surface tablets with Windows RT are considered mobile. @@ -251,7 +252,7 @@ class Mobile_Detect // Prestigio Tablets http://www.prestigio.com/support 'PrestigioTablet' => 'PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD|PMP812E|PMP812E3G|PMP812F|PMP810E|PMP880TD|PMT3017|PMT3037|PMT3047|PMT3057|PMT7008|PMT5887|PMT5001|PMT5002', // http://support.lenovo.com/en_GB/downloads/default.page?# - 'LenovoTablet' => 'Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-850M|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)|TB-X103F|TB-X304F|TB-X304L|TB-8703F|Tab2A7-10F|TB2-X30L', + 'LenovoTablet' => 'Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-850M|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)|TB-X103F|TB-X304X|TB-X304F|TB-X304L|TB-X505F|TB-X505L|TB-X505X|TB-X605F|TB-X605L|TB-8703F|TB-8703X|TB-8703N|TB-8704N|TB-8704F|TB-8704X|TB-8704V|TB-7304F|TB-7304I|TB-7304X|Tab2A7-10F|Tab2A7-20F|TB2-X30L|YT3-X50L|YT3-X50F|YT3-X50M|YT-X705F|YT-X703F|YT-X703L|YT-X705L|YT-X705X|TB2-X30F|TB2-X30L|TB2-X30M|A2107A-F|A2107A-H|TB3-730F|TB3-730M|TB3-730X|TB-7504F|TB-7504X', // http://www.dell.com/support/home/us/en/04/Products/tab_mob/tablets 'DellTablet' => 'Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7', // http://www.yarvik.com/en/matrix/tablets/ @@ -301,10 +302,10 @@ class Mobile_Detect // http://www.fly-phone.com/devices/tablets/ ; http://www.fly-phone.com/service/ 'FlyTablet' => 'IQ310|Fly Vision', // http://www.bqreaders.com/gb/tablets-prices-sale.html - 'bqTablet' => 'Android.*(bq)?.*(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant|Aquaris ([E|M]10|M8))|Maxwell.*Lite|Maxwell.*Plus', + 'bqTablet' => 'Android.*(bq)?.*\b(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant|Aquaris ([E|M]10|M8))\b|Maxwell.*Lite|Maxwell.*Plus', // http://www.huaweidevice.com/worldwide/productFamily.do?method=index&directoryId=5011&treeId=3290 // http://www.huaweidevice.com/worldwide/downloadCenter.do?method=index&directoryId=3372&treeId=0&tb=1&type=software (including legacy tablets) - 'HuaweiTablet' => 'MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim|M2-A01L|BAH-L09|BAH-W09', + 'HuaweiTablet' => 'MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim|M2-A01L|BAH-L09|BAH-W09|AGS-L09|CMR-AL19', // Nec or Medias Tab 'NecTablet' => '\bN-06D|\bN-08D', // Pantech Tablets: http://www.pantechusa.com/phones/ @@ -314,7 +315,7 @@ class Mobile_Detect // http://versusuk.com/support.html 'VersusTablet' => 'TOUCHPAD.*[78910]|\bTOUCHTAB\b', // http://www.zync.in/index.php/our-products/tablet-phablets - 'ZyncTablet' => 'z1000|Z99 2G|z99|z930|z999|z990|z909|Z919|z900', + 'ZyncTablet' => 'z1000|Z99 2G|z930|z990|z909|Z919|z900', // Removed "z999" because of https://github.com/serbanghita/Mobile-Detect/issues/717 // http://www.positivoinformatica.com.br/www/pessoal/tablet-ypy/ 'PositivoTablet' => 'TB07STA|TB10STA|TB07FTA|TB10FTA', // https://www.nabitablet.com/ @@ -377,7 +378,7 @@ class Mobile_Detect 'GoCleverTablet' => 'GOCLEVER TAB|A7GOCLEVER|M1042|M7841|M742|R1042BK|R1041|TAB A975|TAB A7842|TAB A741|TAB A741L|TAB M723G|TAB M721|TAB A1021|TAB I921|TAB R721|TAB I720|TAB T76|TAB R70|TAB R76.2|TAB R106|TAB R83.2|TAB M813G|TAB I721|GCTA722|TAB I70|TAB I71|TAB S73|TAB R73|TAB R74|TAB R93|TAB R75|TAB R76.1|TAB A73|TAB A93|TAB A93.2|TAB T72|TAB R83|TAB R974|TAB R973|TAB A101|TAB A103|TAB A104|TAB A104.2|R105BK|M713G|A972BK|TAB A971|TAB R974.2|TAB R104|TAB R83.3|TAB A1042', // Modecom Tablets - http://www.modecom.eu/tablets/portal/ 'ModecomTablet' => 'FreeTAB 9000|FreeTAB 7.4|FreeTAB 7004|FreeTAB 7800|FreeTAB 2096|FreeTAB 7.5|FreeTAB 1014|FreeTAB 1001 |FreeTAB 8001|FreeTAB 9706|FreeTAB 9702|FreeTAB 7003|FreeTAB 7002|FreeTAB 1002|FreeTAB 7801|FreeTAB 1331|FreeTAB 1004|FreeTAB 8002|FreeTAB 8014|FreeTAB 9704|FreeTAB 1003', - // Vonino Tablets - http://www.vonino.eu/tablets + // Vonino Tablets 'VoninoTablet' => '\b(Argus[ _]?S|Diamond[ _]?79HD|Emerald[ _]?78E|Luna[ _]?70C|Onyx[ _]?S|Onyx[ _]?Z|Orin[ _]?HD|Orin[ _]?S|Otis[ _]?S|SpeedStar[ _]?S|Magnet[ _]?M9|Primus[ _]?94[ _]?3G|Primus[ _]?94HD|Primus[ _]?QS|Android.*\bQ8\b|Sirius[ _]?EVO[ _]?QS|Sirius[ _]?QS|Spirit[ _]?S)\b', // ECS Tablets - http://www.ecs.com.tw/ECSWebSite/Product/Product_Tablet_List.aspx?CategoryID=14&MenuID=107&childid=M_107&LanID=0 'ECSTablet' => 'V07OT2|TM105A|S10OT1|TR10CS1', @@ -385,7 +386,7 @@ class Mobile_Detect // @note: no need to add all the tablet codes since they are guided by the first regex. 'StorexTablet' => 'eZee[_\']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab', // Generic Vodafone tablets. - 'VodafoneTablet' => 'SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7|VF-1497', + 'VodafoneTablet' => 'SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7|VF-1497|VFD 1400', // French tablets - Essentiel B http://www.boulanger.fr/tablette_tactile_e-book/tablette_tactile_essentiel_b/cl_68908.htm?multiChoiceToDelete=brand&mc_brand=essentielb // Aka: http://www.essentielb.fr/ 'EssentielBTablet' => 'Smart[ \']?TAB[ ]+?[0-9]+|Family[ \']?TAB2', @@ -484,7 +485,7 @@ class Mobile_Detect 'PalmOS' => 'PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino', 'SymbianOS' => 'Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\bS60\b', // @reference: http://en.wikipedia.org/wiki/Windows_Mobile - 'WindowsMobileOS' => 'Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;', + 'WindowsMobileOS' => 'Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Windows Mobile|Windows Phone [0-9.]+|WCE;', // @reference: http://en.wikipedia.org/wiki/Windows_Phone // http://wifeng.cn/?r=blog&a=view&id=106 // http://nicksnettravels.builttoroam.com/post/2011/01/10/Bogus-Windows-Phone-7-User-Agent-String.aspx @@ -492,6 +493,8 @@ class Mobile_Detect // https://msdn.microsoft.com/en-us/library/hh869301(v=vs.85).aspx 'WindowsPhoneOS' => 'Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;', 'iOS' => '\biPhone.*Mobile|\biPod|\biPad|AppleCoreMedia', + // https://en.wikipedia.org/wiki/IPadOS + 'iPadOS' => 'CPU OS 13', // http://en.wikipedia.org/wiki/MeeGo // @todo: research MeeGo in UAs 'MeeGoOS' => 'MeeGo', @@ -539,7 +542,8 @@ class Mobile_Detect // https://github.com/serbanghita/Mobile-Detect/issues/7 'DiigoBrowser' => 'DiigoBrowser', // http://www.puffinbrowser.com/index.php - 'Puffin' => 'Puffin', + // https://github.com/serbanghita/Mobile-Detect/issues/752 + // 'Puffin' => 'Puffin', // http://mercury-browser.com/index.html 'Mercury' => '\bMercury\b', // http://en.wikipedia.org/wiki/Obigo_Browser @@ -563,7 +567,7 @@ class Mobile_Detect // http://scottcate.com/technology/windows-phone-8-ie10-desktop-or-mobile/ // https://github.com/serbanghita/Mobile-Detect/issues/57#issuecomment-15024011 // https://developers.facebook.com/docs/sharing/best-practices - 'Bot' => 'Googlebot|facebookexternalhit|AdsBot-Google|Google Keyword Suggestion|Facebot|YandexBot|YandexMobileBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|Exabot|MJ12bot|YandexImages|TurnitinBot|Pingdom', + 'Bot' => 'Googlebot|facebookexternalhit|Google-AMPHTML|s~amp-validator|AdsBot-Google|Google Keyword Suggestion|Facebot|YandexBot|YandexMobileBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|Exabot|MJ12bot|YandexImages|TurnitinBot|Pingdom|contentkingapp', 'MobileBot' => 'Googlebot-Mobile|AdsBot-Google-Mobile|YahooSeeker/M1A1-R2D2', 'DesktopMode' => 'WPDesktop', 'TV' => 'SonyDTV|HbbTV', // experimental diff --git a/vendor/mobiledetect/mobiledetectlib/README.md b/vendor/mobiledetect/mobiledetectlib/README.md index 310d9f3..d73757b 100644 --- a/vendor/mobiledetect/mobiledetectlib/README.md +++ b/vendor/mobiledetect/mobiledetectlib/README.md @@ -68,13 +68,13 @@ or include the dependency in the `composer.json` file: #### Demo -* [:iphone: Live demo!](http://is.gd/mobiletest) +* [:iphone: Live demo!](http://demo.mobiledetect.net) * [Code examples](../../wiki/Code-examples) #### Contribute *Submit a PR* -> Submit a pull request but before make sure you read [how to contribute](../../docs/CONTRIBUTING.md) guide. +> Submit a pull request but before make sure you read [how to contribute](docs/CONTRIBUTING.md) guide. *Donate* @@ -92,7 +92,7 @@ Special thanks to the community :+1: for donations, JetBrains team for the conti > [Submit new module, plugin, port](../../issues/new?title=New%203rd%20party%20module&body=Name,%20Link%20and%20Description%20of%20the%20module.) :point_right: Keep `Mobile_Detect.php` class in a separate `module` and do NOT include it in your script core because of the high frequency of updates. -:point_right: When including the class into you `web application` or `module` always use `include_once '../path/to/Mobile_Detect.php` to prevent conflicts. +:point_right: When including the class into your `web application` or `module` always use `include_once '../path/to/Mobile_Detect.php` to prevent conflicts. **JavaScript** diff --git a/vendor/mobiledetect/mobiledetectlib/docker-compose.yml b/vendor/mobiledetect/mobiledetectlib/docker-compose.yml new file mode 100644 index 0000000..58ce75e --- /dev/null +++ b/vendor/mobiledetect/mobiledetectlib/docker-compose.yml @@ -0,0 +1,16 @@ +app: + restart: 'on-failure' + image: php:7 + working_dir: /app + command: vendor/bin/phpunit -v -c tests/phpunit.xml --coverage-text --strict-coverage --stop-on-risky + ports: + - "8000:8000" + volumes: + - .:/app + +composer: + restart: 'no' + image: composer/composer:php7 + command: install + volumes: + - .:/app \ No newline at end of file diff --git a/vendor/mobiledetect/mobiledetectlib/docs/KNOWN_LIMITATIONS.md b/vendor/mobiledetect/mobiledetectlib/docs/KNOWN_LIMITATIONS.md index 8b5d461..5887092 100644 --- a/vendor/mobiledetect/mobiledetectlib/docs/KNOWN_LIMITATIONS.md +++ b/vendor/mobiledetect/mobiledetectlib/docs/KNOWN_LIMITATIONS.md @@ -3,7 +3,8 @@ * Mobile Detect script was designed to detect `mobile` devices. Implicitly other devices are considered to be `desktop`. * User-Agent and HTTP headers sniffing is a non reliable method of detecting a mobile device. * If the mobile browser is set on `Desktop mode`, the Mobile Detect script has no way of knowing that the device is `mobile`. -* Some touchscreen devices (eg. Microsoft Surface) are tough to detect as mobile since they can be used in a laptop mode. +* Some touchscreen devices (eg. Microsoft Surface) are tough to detect as mobile since they can be used in a laptop mode. See: [#32](https://github.com/serbanghita/Mobile-Detect/issues/32), [#461](https://github.com/serbanghita/Mobile-Detect/issues/461), [#667](https://github.com/serbanghita/Mobile-Detect/issues/667) +* Some mobile devices (eg. IPadOS, Google Pixel Slate). See: [#795](https://github.com/serbanghita/Mobile-Detect/issues/795), [#788](https://github.com/serbanghita/Mobile-Detect/issues/788) * Detecting the device brand (eg. Apple, Samsung, HTC) is not 100% reliable. * We don't monitor the quality of the 3rd party tools based on Mobile Detect script. We cannot guarantee that they are using the class properly or if they provide the latest version. diff --git a/vendor/monolog/monolog/.php_cs b/vendor/monolog/monolog/.php_cs deleted file mode 100644 index 366ccd0..0000000 --- a/vendor/monolog/monolog/.php_cs +++ /dev/null @@ -1,59 +0,0 @@ - - -For the full copyright and license information, please view the LICENSE -file that was distributed with this source code. -EOF; - -$finder = Symfony\CS\Finder::create() - ->files() - ->name('*.php') - ->exclude('Fixtures') - ->in(__DIR__.'/src') - ->in(__DIR__.'/tests') -; - -return Symfony\CS\Config::create() - ->setUsingCache(true) - //->setUsingLinter(false) - ->setRiskyAllowed(true) - ->setRules(array( - '@PSR2' => true, - 'binary_operator_spaces' => true, - 'blank_line_before_return' => true, - 'header_comment' => array('header' => $header), - 'include' => true, - 'long_array_syntax' => true, - 'method_separation' => true, - 'no_blank_lines_after_class_opening' => true, - 'no_blank_lines_after_phpdoc' => true, - 'no_blank_lines_between_uses' => true, - 'no_duplicate_semicolons' => true, - 'no_extra_consecutive_blank_lines' => true, - 'no_leading_import_slash' => true, - 'no_leading_namespace_whitespace' => true, - 'no_trailing_comma_in_singleline_array' => true, - 'no_unused_imports' => true, - 'object_operator_without_whitespace' => true, - 'phpdoc_align' => true, - 'phpdoc_indent' => true, - 'phpdoc_no_access' => true, - 'phpdoc_no_package' => true, - 'phpdoc_order' => true, - 'phpdoc_scalar' => true, - 'phpdoc_trim' => true, - 'phpdoc_type_to_var' => true, - 'psr0' => true, - 'single_blank_line_before_namespace' => true, - 'spaces_cast' => true, - 'standardize_not_equals' => true, - 'ternary_operator_spaces' => true, - 'trailing_comma_in_multiline_array' => true, - 'whitespacy_lines' => true, - )) - ->finder($finder) -; diff --git a/vendor/monolog/monolog/CHANGELOG.md b/vendor/monolog/monolog/CHANGELOG.md index bcf679c..3005e38 100644 --- a/vendor/monolog/monolog/CHANGELOG.md +++ b/vendor/monolog/monolog/CHANGELOG.md @@ -1,11 +1,72 @@ +### 2.0.0 (2019-08-30) + + * BC Break: This is a major release, see [UPGRADE.md](UPGRADE.md) for details if you are coming from a 1.x release + * BC Break: Logger methods log/debug/info/notice/warning/error/critical/alert/emergency now have explicit void return types + * Added FallbackGroupHandler which works like the WhatFailureGroupHandler but stops dispatching log records as soon as one handler accepted it + * Fixed support for UTF-8 when cutting strings to avoid cutting a multibyte-character in half + * Fixed normalizers handling of exception backtraces to avoid serializing arguments in some cases + * Fixed date timezone handling in SyslogUdpHandler + +### 2.0.0-beta2 (2019-07-06) + + * BC Break: This is a major release, see [UPGRADE.md](UPGRADE.md) for details if you are coming from a 1.x release + * BC Break: PHP 7.2 is now the minimum required PHP version. + * BC Break: Removed SlackbotHandler, RavenHandler and HipChatHandler, see [UPGRADE.md](UPGRADE.md) for details + * Added OverflowHandler which will only flush log records to its nested handler when reaching a certain amount of logs (i.e. only pass through when things go really bad) + * Added TelegramBotHandler to log records to a [Telegram](https://core.telegram.org/bots/api) bot account + * Added support for JsonSerializable when normalizing exceptions + * Added support for RFC3164 (outdated BSD syslog protocol) to SyslogUdpHandler + * Added SoapFault details to formatted exceptions + * Fixed DeduplicationHandler silently failing to start when file could not be opened + * Fixed issue in GroupHandler and WhatFailureGroupHandler where setting multiple processors would duplicate records + * Fixed GelfFormatter losing some data when one attachment was too long + * Fixed issue in SignalHandler restarting syscalls functionality + * Improved performance of LogglyHandler when sending multiple logs in a single request + +### 2.0.0-beta1 (2018-12-08) + + * BC Break: This is a major release, see [UPGRADE.md](UPGRADE.md) for details if you are coming from a 1.x release + * BC Break: PHP 7.1 is now the minimum required PHP version. + * BC Break: Quite a few interface changes, only relevant if you implemented your own handlers/processors/formatters + * BC Break: Removed non-PSR-3 methods to add records, all the `add*` (e.g. `addWarning`) methods as well as `emerg`, `crit`, `err` and `warn` + * BC Break: The record timezone is now set per Logger instance and not statically anymore + * BC Break: There is no more default handler configured on empty Logger instances + * BC Break: ElasticSearchHandler renamed to ElasticaHandler + * BC Break: Various handler-specific breaks, see [UPGRADE.md](UPGRADE.md) for details + * Added scalar type hints and return hints in all the places it was possible. Switched strict_types on for more reliability. + * Added DateTimeImmutable support, all record datetime are now immutable, and will toString/json serialize with the correct date format, including microseconds (unless disabled) + * Added timezone and microseconds to the default date format + * Added SendGridHandler to use the SendGrid API to send emails + * Added LogmaticHandler to use the Logmatic.io API to store log records + * Added SqsHandler to send log records to an AWS SQS queue + * Added ElasticsearchHandler to send records via the official ES library. Elastica users should now use ElasticaHandler instead of ElasticSearchHandler + * Added NoopHandler which is similar to the NullHandle but does not prevent the bubbling of log records to handlers further down the configuration, useful for temporarily disabling a handler in configuration files + * Added ProcessHandler to write log output to the STDIN of a given process + * Added HostnameProcessor that adds the machine's hostname to log records + * Added a `$dateFormat` option to the PsrLogMessageProcessor which lets you format DateTime instances nicely + * Added support for the PHP 7.x `mongodb` extension in the MongoDBHandler + * Fixed many minor issues in various handlers, and probably added a few regressions too + +### 1.25.0 (xx) + + * Deprecated SlackbotHandler, use SlackWebhookHandler or SlackHandler instead + * Deprecated RavenHandler, use sentry/sentry 2.x and their Sentry\Monolog\Handler instead + * Deprecated HipChatHandler, migrate to Slack and use SlackWebhookHandler or SlackHandler instead + * Added support for RFC3164 (outdated BSD syslog protocol) to SyslogUdpHandler + * Fixed issue in GroupHandler and WhatFailureGroupHandler where setting multiple processors would duplicate records + * Fixed issue in SignalHandler restarting syscalls functionality + * Fixed normalizers handling of exception backtraces to avoid serializing arguments in some cases + * Fixed ZendMonitorHandler to work with the latest Zend Server versions + ### 1.24.0 (2018-11-05) + * BC Notice: If you are extending any of the Monolog's Formatters' `normalize` method, make sure you add the new `$depth = 0` argument to your function signature to avoid strict PHP warnings. * Added a `ResettableInterface` in order to reset/reset/clear/flush handlers and processors * Added a `ProcessorInterface` as an optional way to label a class as being a processor (mostly useful for autowiring dependency containers) * Added a way to log signals being received using Monolog\SignalHandler * Added ability to customize error handling at the Logger level using Logger::setExceptionHandler * Added InsightOpsHandler to migrate users of the LogEntriesHandler - * Added protection to NormalizerHandler against circular and very deep structures, it now stops normalizing at a depth of 9 + * Added protection to NormalizerFormatter against circular and very deep structures, it now stops normalizing at a depth of 9 * Added capture of stack traces to ErrorHandler when logging PHP errors * Added RavenHandler support for a `contexts` context or extra key to forward that to Sentry's contexts * Added forwarding of context info to FluentdFormatter @@ -45,7 +106,7 @@ * Added SlackbotHandler and SlackWebhookHandler to set up Slack integration more easily * Added MercurialProcessor to add mercurial revision and branch names to log records * Added support for AWS SDK v3 in DynamoDbHandler - * Fixed fatal errors occuring when normalizing generators that have been fully consumed + * Fixed fatal errors occurring when normalizing generators that have been fully consumed * Fixed RollbarHandler to include a level (rollbar level), monolog_level (original name), channel and datetime (unix) * Fixed RollbarHandler not flushing records automatically, calling close() explicitly is not necessary anymore * Fixed SyslogUdpHandler to avoid sending empty frames @@ -55,7 +116,7 @@ * Break: Reverted the addition of $context when the ErrorHandler handles regular php errors from 1.20.0 as it was causing issues * Added support for more formats in RotatingFileHandler::setFilenameFormat as long as they have Y, m and d in order - * Added ability to format the main line of text the SlackHandler sends by explictly setting a formatter on the handler + * Added ability to format the main line of text the SlackHandler sends by explicitly setting a formatter on the handler * Added information about SoapFault instances in NormalizerFormatter * Added $handleOnlyReportedErrors option on ErrorHandler::registerErrorHandler (default true) to allow logging of all errors no matter the error_reporting level @@ -177,7 +238,7 @@ * Added $useShortAttachment to SlackHandler to minify attachment size and $includeExtra to append extra data * Added $host to HipChatHandler for users of private instances * Added $transactionName to NewRelicHandler and support for a transaction_name context value - * Fixed MandrillHandler to avoid outputing API call responses + * Fixed MandrillHandler to avoid outputting API call responses * Fixed some non-standard behaviors in SyslogUdpHandler ### 1.11.0 (2014-09-30) diff --git a/vendor/monolog/monolog/LICENSE b/vendor/monolog/monolog/LICENSE index 1647321..5170c6d 100644 --- a/vendor/monolog/monolog/LICENSE +++ b/vendor/monolog/monolog/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2011-2016 Jordi Boggiano +Copyright (c) 2011-2019 Jordi Boggiano Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/vendor/monolog/monolog/README.md b/vendor/monolog/monolog/README.md index d756944..4a81a42 100644 --- a/vendor/monolog/monolog/README.md +++ b/vendor/monolog/monolog/README.md @@ -36,16 +36,21 @@ $log = new Logger('name'); $log->pushHandler(new StreamHandler('path/to/your.log', Logger::WARNING)); // add records to the log -$log->addWarning('Foo'); -$log->addError('Bar'); +$log->warning('Foo'); +$log->error('Bar'); ``` ## Documentation - [Usage Instructions](doc/01-usage.md) - [Handlers, Formatters and Processors](doc/02-handlers-formatters-processors.md) -- [Utility classes](doc/03-utilities.md) +- [Utility Classes](doc/03-utilities.md) - [Extending Monolog](doc/04-extending.md) +- [Log Record Structure](doc/message-structure.md) + +## Support + +Get supported Monolog and help fund the project with the [Tidelift Subscription](https://tidelift.com/subscription/pkg/packagist-monolog-monolog?utm_source=packagist-monolog-monolog&utm_medium=referral&utm_campaign=readme) ## Third Party Packages @@ -57,7 +62,7 @@ can also add your own there if you publish one. ### Requirements -- Monolog works with PHP 5.3 or above, and is also tested to work with HHVM. +- Monolog 2.x works with PHP 7.2 or above, use Monolog `^1.0` for PHP 5.3+ support. ### Submitting bugs and feature requests @@ -67,17 +72,21 @@ Bugs and feature request are tracked on [GitHub](https://github.com/Seldaek/mono - Frameworks and libraries using [PSR-3](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md) can be used very easily with Monolog since it implements the interface. -- [Symfony2](http://symfony.com) comes out of the box with Monolog. -- [Silex](http://silex.sensiolabs.org/) comes out of the box with Monolog. +- [Symfony](http://symfony.com) comes out of the box with Monolog. - [Laravel 4 & 5](http://laravel.com/) come out of the box with Monolog. - [Lumen](http://lumen.laravel.com/) comes out of the box with Monolog. -- [PPI](http://www.ppi.io/) comes out of the box with Monolog. +- [PPI](https://github.com/ppi/framework) comes out of the box with Monolog. - [CakePHP](http://cakephp.org/) is usable with Monolog via the [cakephp-monolog](https://github.com/jadb/cakephp-monolog) plugin. - [Slim](http://www.slimframework.com/) is usable with Monolog via the [Slim-Monolog](https://github.com/Flynsarmy/Slim-Monolog) log writer. - [XOOPS 2.6](http://xoops.org/) comes out of the box with Monolog. - [Aura.Web_Project](https://github.com/auraphp/Aura.Web_Project) comes out of the box with Monolog. - [Nette Framework](http://nette.org/en/) can be used with Monolog via [Kdyby/Monolog](https://github.com/Kdyby/Monolog) extension. - [Proton Micro Framework](https://github.com/alexbilbie/Proton) comes out of the box with Monolog. +- [FuelPHP](http://fuelphp.com/) comes out of the box with Monolog. +- [Equip Framework](https://github.com/equip/framework) comes out of the box with Monolog. +- [Yii 2](http://www.yiiframework.com/) is usable with Monolog via the [yii2-monolog](https://github.com/merorafael/yii2-monolog) or [yii2-psr-log-target](https://github.com/samdark/yii2-psr-log-target) plugins. +- [Hawkbit Micro Framework](https://github.com/HawkBitPhp/hawkbit) comes out of the box with Monolog. +- [SilverStripe 4](https://www.silverstripe.org/) comes out of the box with Monolog. ### Author @@ -90,5 +99,5 @@ Monolog is licensed under the MIT License - see the `LICENSE` file for details ### Acknowledgements -This library is heavily inspired by Python's [Logbook](http://packages.python.org/Logbook/) +This library is heavily inspired by Python's [Logbook](https://logbook.readthedocs.io/en/stable/) library, although most concepts have been adjusted to fit to the PHP world. diff --git a/vendor/monolog/monolog/UPGRADE.md b/vendor/monolog/monolog/UPGRADE.md new file mode 100644 index 0000000..84e15e6 --- /dev/null +++ b/vendor/monolog/monolog/UPGRADE.md @@ -0,0 +1,72 @@ +### 2.0.0 + +- `Monolog\Logger::API` can be used to distinguish between a Monolog `1` and `2` + install of Monolog when writing integration code. + +- Removed non-PSR-3 methods to add records, all the `add*` (e.g. `addWarning`) + methods as well as `emerg`, `crit`, `err` and `warn`. + +- DateTime are now formatted with a timezone and microseconds (unless disabled). + Various formatters and log output might be affected, which may mess with log parsing + in some cases. + +- The `datetime` in every record array is now a DateTimeImmutable, not that you + should have been modifying these anyway. + +- The timezone is now set per Logger instance and not statically, either + via ->setTimezone or passed in the constructor. Calls to Logger::setTimezone + should be converted. + +- `HandlerInterface` has been split off and two new interfaces now exist for + more granular controls: `ProcessableHandlerInterface` and + `FormattableHandlerInterface`. Handlers not extending `AbstractHandler` + should make sure to implement the relevant interfaces. + +- `HandlerInterface` now requires the `close` method to be implemented. This + only impacts you if you implement the interface yourself, but you can extend + the new `Monolog\Handler\Handler` base class too. + +- There is no more default handler configured on empty Logger instances, if + you were relying on that you will not get any output anymore, make sure to + configure the handler you need. + +#### LogglyFormatter + +- The records' `datetime` is not sent anymore. Only `timestamp` is sent to Loggly. + +#### AmqpHandler + +- Log levels are not shortened to 4 characters anymore. e.g. a warning record + will be sent using the `warning.channel` routing key instead of `warn.channel` + as in 1.x. +- The exchange name does not default to 'log' anymore, and it is completely ignored + now for the AMQP extension users. Only PHPAmqpLib uses it if provided. + +#### RotatingFileHandler + +- The file name format must now contain `{date}` and the date format must be set + to one of the predefined FILE_PER_* constants to avoid issues with file rotation. + See `setFilenameFormat`. + +#### LogstashFormatter + +- Removed Logstash V0 support +- Context/extra prefix has been removed in favor of letting users configure the exact key being sent +- Context/extra data are now sent as an object instead of single keys + +#### HipChatHandler + +- Removed deprecated HipChat handler, migrate to Slack and use SlackWebhookHandler or SlackHandler instead + +#### SlackbotHandler + +- Removed deprecated SlackbotHandler handler, use SlackWebhookHandler or SlackHandler instead + +#### RavenHandler + +- Removed deprecated RavenHandler handler, use sentry/sentry 2.x and their Sentry\Monolog\Handler instead + +#### ElasticSearchHandler + +- As support for the official Elasticsearch library was added, the former ElasticSearchHandler has been + renamed to ElasticaHandler and the new one added as ElasticsearchHandler. diff --git a/vendor/monolog/monolog/composer.json b/vendor/monolog/monolog/composer.json index 3b0c880..21d8064 100644 --- a/vendor/monolog/monolog/composer.json +++ b/vendor/monolog/monolog/composer.json @@ -13,35 +13,37 @@ } ], "require": { - "php": ">=5.3.0", - "psr/log": "~1.0" + "php": "^7.2", + "psr/log": "^1.0.1" }, "require-dev": { - "phpunit/phpunit": "~4.5", - "graylog2/gelf-php": "~1.0", - "sentry/sentry": "^0.13", - "ruflin/elastica": ">=0.90 <3.0", - "doctrine/couchdb": "~1.0@dev", "aws/aws-sdk-php": "^2.4.9 || ^3.0", + "doctrine/couchdb": "~1.0@dev", + "elasticsearch/elasticsearch": "^6.0", + "graylog2/gelf-php": "^1.4.2", + "jakub-onderka/php-parallel-lint": "^0.9", "php-amqplib/php-amqplib": "~2.4", - "swiftmailer/swiftmailer": "^5.3|^6.0", "php-console/php-console": "^3.1.3", - "phpunit/phpunit-mock-objects": "2.3.0", - "jakub-onderka/php-parallel-lint": "0.9" + "phpspec/prophecy": "^1.6.1", + "phpunit/phpunit": "^8.3", + "predis/predis": "^1.1", + "rollbar/rollbar": "^1.3", + "ruflin/elastica": ">=0.90 <3.0", + "swiftmailer/swiftmailer": "^5.3|^6.0" }, - "_": "phpunit/phpunit-mock-objects required in 2.3.0 due to https://github.com/sebastianbergmann/phpunit-mock-objects/issues/223 - needs hhvm 3.8+ on travis", "suggest": { "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", - "sentry/sentry": "Allow sending log messages to a Sentry server", "doctrine/couchdb": "Allow sending log messages to a CouchDB server", "ruflin/elastica": "Allow sending log messages to an Elastic Search server", + "elasticsearch/elasticsearch": "Allow sending log messages to an Elasticsearch server via official client", "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", - "ext-mongo": "Allow sending log messages to a MongoDB server", - "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver", + "ext-mongodb": "Allow sending log messages to a MongoDB server (via driver)", + "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)", "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", "rollbar/rollbar": "Allow sending log messages to Rollbar", - "php-console/php-console": "Allow sending log messages to Google Chrome" + "php-console/php-console": "Allow sending log messages to Google Chrome", + "ext-mbstring": "Allow to work properly with unicode symbols" }, "autoload": { "psr-4": {"Monolog\\": "src/Monolog"} @@ -54,7 +56,7 @@ }, "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "2.x-dev" } }, "scripts": { @@ -62,5 +64,8 @@ "parallel-lint . --exclude vendor", "phpunit" ] + }, + "config": { + "sort-packages": true } } diff --git a/vendor/monolog/monolog/doc/01-usage.md b/vendor/monolog/monolog/doc/01-usage.md deleted file mode 100644 index 8e2551f..0000000 --- a/vendor/monolog/monolog/doc/01-usage.md +++ /dev/null @@ -1,231 +0,0 @@ -# Using Monolog - -- [Installation](#installation) -- [Core Concepts](#core-concepts) -- [Log Levels](#log-levels) -- [Configuring a logger](#configuring-a-logger) -- [Adding extra data in the records](#adding-extra-data-in-the-records) -- [Leveraging channels](#leveraging-channels) -- [Customizing the log format](#customizing-the-log-format) - -## Installation - -Monolog is available on Packagist ([monolog/monolog](http://packagist.org/packages/monolog/monolog)) -and as such installable via [Composer](http://getcomposer.org/). - -```bash -composer require monolog/monolog -``` - -If you do not use Composer, you can grab the code from GitHub, and use any -PSR-0 compatible autoloader (e.g. the [Symfony2 ClassLoader component](https://github.com/symfony/ClassLoader)) -to load Monolog classes. - -## Core Concepts - -Every `Logger` instance has a channel (name) and a stack of handlers. Whenever -you add a record to the logger, it traverses the handler stack. Each handler -decides whether it fully handled the record, and if so, the propagation of the -record ends there. - -This allows for flexible logging setups, for example having a `StreamHandler` at -the bottom of the stack that will log anything to disk, and on top of that add -a `MailHandler` that will send emails only when an error message is logged. -Handlers also have a `$bubble` property which defines whether they block the -record or not if they handled it. In this example, setting the `MailHandler`'s -`$bubble` argument to false means that records handled by the `MailHandler` will -not propagate to the `StreamHandler` anymore. - -You can create many `Logger`s, each defining a channel (e.g.: db, request, -router, ..) and each of them combining various handlers, which can be shared -or not. The channel is reflected in the logs and allows you to easily see or -filter records. - -Each Handler also has a Formatter, a default one with settings that make sense -will be created if you don't set one. The formatters normalize and format -incoming records so that they can be used by the handlers to output useful -information. - -Custom severity levels are not available. Only the eight -[RFC 5424](http://tools.ietf.org/html/rfc5424) levels (debug, info, notice, -warning, error, critical, alert, emergency) are present for basic filtering -purposes, but for sorting and other use cases that would require -flexibility, you should add Processors to the Logger that can add extra -information (tags, user ip, ..) to the records before they are handled. - -## Log Levels - -Monolog supports the logging levels described by [RFC 5424](http://tools.ietf.org/html/rfc5424). - -- **DEBUG** (100): Detailed debug information. - -- **INFO** (200): Interesting events. Examples: User logs in, SQL logs. - -- **NOTICE** (250): Normal but significant events. - -- **WARNING** (300): Exceptional occurrences that are not errors. Examples: - Use of deprecated APIs, poor use of an API, undesirable things that are not - necessarily wrong. - -- **ERROR** (400): Runtime errors that do not require immediate action but - should typically be logged and monitored. - -- **CRITICAL** (500): Critical conditions. Example: Application component - unavailable, unexpected exception. - -- **ALERT** (550): Action must be taken immediately. Example: Entire website - down, database unavailable, etc. This should trigger the SMS alerts and wake - you up. - -- **EMERGENCY** (600): Emergency: system is unusable. - -## Configuring a logger - -Here is a basic setup to log to a file and to firephp on the DEBUG level: - -```php -pushHandler(new StreamHandler(__DIR__.'/my_app.log', Logger::DEBUG)); -$logger->pushHandler(new FirePHPHandler()); - -// You can now use your logger -$logger->addInfo('My logger is now ready'); -``` - -Let's explain it. The first step is to create the logger instance which will -be used in your code. The argument is a channel name, which is useful when -you use several loggers (see below for more details about it). - -The logger itself does not know how to handle a record. It delegates it to -some handlers. The code above registers two handlers in the stack to allow -handling records in two different ways. - -Note that the FirePHPHandler is called first as it is added on top of the -stack. This allows you to temporarily add a logger with bubbling disabled if -you want to override other configured loggers. - -> If you use Monolog standalone and are looking for an easy way to -> configure many handlers, the [theorchard/monolog-cascade](https://github.com/theorchard/monolog-cascade) -> can help you build complex logging configs via PHP arrays, yaml or json configs. - -## Adding extra data in the records - -Monolog provides two different ways to add extra informations along the simple -textual message. - -### Using the logging context - -The first way is the context, allowing to pass an array of data along the -record: - -```php -addInfo('Adding a new user', array('username' => 'Seldaek')); -``` - -Simple handlers (like the StreamHandler for instance) will simply format -the array to a string but richer handlers can take advantage of the context -(FirePHP is able to display arrays in pretty way for instance). - -### Using processors - -The second way is to add extra data for all records by using a processor. -Processors can be any callable. They will get the record as parameter and -must return it after having eventually changed the `extra` part of it. Let's -write a processor adding some dummy data in the record: - -```php -pushProcessor(function ($record) { - $record['extra']['dummy'] = 'Hello world!'; - - return $record; -}); -``` - -Monolog provides some built-in processors that can be used in your project. -Look at the [dedicated chapter](https://github.com/Seldaek/monolog/blob/master/doc/02-handlers-formatters-processors.md#processors) for the list. - -> Tip: processors can also be registered on a specific handler instead of - the logger to apply only for this handler. - -## Leveraging channels - -Channels are a great way to identify to which part of the application a record -is related. This is useful in big applications (and is leveraged by -MonologBundle in Symfony2). - -Picture two loggers sharing a handler that writes to a single log file. -Channels would allow you to identify the logger that issued every record. -You can easily grep through the log files filtering this or that channel. - -```php -pushHandler($stream); -$logger->pushHandler($firephp); - -// Create a logger for the security-related stuff with a different channel -$securityLogger = new Logger('security'); -$securityLogger->pushHandler($stream); -$securityLogger->pushHandler($firephp); - -// Or clone the first one to only change the channel -$securityLogger = $logger->withName('security'); -``` - -## Customizing the log format - -In Monolog it's easy to customize the format of the logs written into files, -sockets, mails, databases and other handlers. Most of the handlers use the - -```php -$record['formatted'] -``` - -value to be automatically put into the log device. This value depends on the -formatter settings. You can choose between predefined formatter classes or -write your own (e.g. a multiline text file for human-readable output). - -To configure a predefined formatter class, just set it as the handler's field: - -```php -// the default date format is "Y-m-d H:i:s" -$dateFormat = "Y n j, g:i a"; -// the default output format is "[%datetime%] %channel%.%level_name%: %message% %context% %extra%\n" -$output = "%datetime% > %level_name% > %message% %context% %extra%\n"; -// finally, create a formatter -$formatter = new LineFormatter($output, $dateFormat); - -// Create a handler -$stream = new StreamHandler(__DIR__.'/my_app.log', Logger::DEBUG); -$stream->setFormatter($formatter); -// bind it to a logger object -$securityLogger = new Logger('security'); -$securityLogger->pushHandler($stream); -``` - -You may also reuse the same formatter between multiple handlers and share those -handlers between multiple loggers. - -[Handlers, Formatters and Processors](02-handlers-formatters-processors.md) → diff --git a/vendor/monolog/monolog/doc/02-handlers-formatters-processors.md b/vendor/monolog/monolog/doc/02-handlers-formatters-processors.md deleted file mode 100644 index af45913..0000000 --- a/vendor/monolog/monolog/doc/02-handlers-formatters-processors.md +++ /dev/null @@ -1,158 +0,0 @@ -# Handlers, Formatters and Processors - -- [Handlers](#handlers) - - [Log to files and syslog](#log-to-files-and-syslog) - - [Send alerts and emails](#send-alerts-and-emails) - - [Log specific servers and networked logging](#log-specific-servers-and-networked-logging) - - [Logging in development](#logging-in-development) - - [Log to databases](#log-to-databases) - - [Wrappers / Special Handlers](#wrappers--special-handlers) -- [Formatters](#formatters) -- [Processors](#processors) -- [Third Party Packages](#third-party-packages) - -## Handlers - -### Log to files and syslog - -- _StreamHandler_: Logs records into any PHP stream, use this for log files. -- _RotatingFileHandler_: Logs records to a file and creates one logfile per day. - It will also delete files older than `$maxFiles`. You should use - [logrotate](http://linuxcommand.org/man_pages/logrotate8.html) for high profile - setups though, this is just meant as a quick and dirty solution. -- _SyslogHandler_: Logs records to the syslog. -- _ErrorLogHandler_: Logs records to PHP's - [`error_log()`](http://docs.php.net/manual/en/function.error-log.php) function. - -### Send alerts and emails - -- _NativeMailerHandler_: Sends emails using PHP's - [`mail()`](http://php.net/manual/en/function.mail.php) function. -- _SwiftMailerHandler_: Sends emails using a [`Swift_Mailer`](http://swiftmailer.org/) instance. -- _PushoverHandler_: Sends mobile notifications via the [Pushover](https://www.pushover.net/) API. -- _HipChatHandler_: Logs records to a [HipChat](http://hipchat.com) chat room using its API. -- _FlowdockHandler_: Logs records to a [Flowdock](https://www.flowdock.com/) account. -- _SlackHandler_: Logs records to a [Slack](https://www.slack.com/) account using the Slack API. -- _SlackbotHandler_: Logs records to a [Slack](https://www.slack.com/) account using the Slackbot incoming hook. -- _SlackWebhookHandler_: Logs records to a [Slack](https://www.slack.com/) account using Slack Webhooks. -- _MandrillHandler_: Sends emails via the Mandrill API using a [`Swift_Message`](http://swiftmailer.org/) instance. -- _FleepHookHandler_: Logs records to a [Fleep](https://fleep.io/) conversation using Webhooks. -- _IFTTTHandler_: Notifies an [IFTTT](https://ifttt.com/maker) trigger with the log channel, level name and message. - -### Log specific servers and networked logging - -- _SocketHandler_: Logs records to [sockets](http://php.net/fsockopen), use this - for UNIX and TCP sockets. See an [example](sockets.md). -- _AmqpHandler_: Logs records to an [amqp](http://www.amqp.org/) compatible - server. Requires the [php-amqp](http://pecl.php.net/package/amqp) extension (1.0+). -- _GelfHandler_: Logs records to a [Graylog2](http://www.graylog2.org) server. -- _CubeHandler_: Logs records to a [Cube](http://square.github.com/cube/) server. -- _RavenHandler_: Logs records to a [Sentry](http://getsentry.com/) server using - [raven](https://packagist.org/packages/raven/raven). -- _ZendMonitorHandler_: Logs records to the Zend Monitor present in Zend Server. -- _NewRelicHandler_: Logs records to a [NewRelic](http://newrelic.com/) application. -- _LogglyHandler_: Logs records to a [Loggly](http://www.loggly.com/) account. -- _RollbarHandler_: Logs records to a [Rollbar](https://rollbar.com/) account. -- _SyslogUdpHandler_: Logs records to a remote [Syslogd](http://www.rsyslog.com/) server. -- _LogEntriesHandler_: Logs records to a [LogEntries](http://logentries.com/) account. -- _InsightOpsHandler_: Logs records to a [InsightOps](https://www.rapid7.com/products/insightops/) account. - -### Logging in development - -- _FirePHPHandler_: Handler for [FirePHP](http://www.firephp.org/), providing - inline `console` messages within [FireBug](http://getfirebug.com/). -- _ChromePHPHandler_: Handler for [ChromePHP](http://www.chromephp.com/), providing - inline `console` messages within Chrome. -- _BrowserConsoleHandler_: Handler to send logs to browser's Javascript `console` with - no browser extension required. Most browsers supporting `console` API are supported. -- _PHPConsoleHandler_: Handler for [PHP Console](https://chrome.google.com/webstore/detail/php-console/nfhmhhlpfleoednkpnnnkolmclajemef), providing - inline `console` and notification popup messages within Chrome. - -### Log to databases - -- _RedisHandler_: Logs records to a [redis](http://redis.io) server. -- _MongoDBHandler_: Handler to write records in MongoDB via a - [Mongo](http://pecl.php.net/package/mongo) extension connection. -- _CouchDBHandler_: Logs records to a CouchDB server. -- _DoctrineCouchDBHandler_: Logs records to a CouchDB server via the Doctrine CouchDB ODM. -- _ElasticSearchHandler_: Logs records to an Elastic Search server. -- _DynamoDbHandler_: Logs records to a DynamoDB table with the [AWS SDK](https://github.com/aws/aws-sdk-php). - -### Wrappers / Special Handlers - -- _FingersCrossedHandler_: A very interesting wrapper. It takes a logger as - parameter and will accumulate log records of all levels until a record - exceeds the defined severity level. At which point it delivers all records, - including those of lower severity, to the handler it wraps. This means that - until an error actually happens you will not see anything in your logs, but - when it happens you will have the full information, including debug and info - records. This provides you with all the information you need, but only when - you need it. -- _DeduplicationHandler_: Useful if you are sending notifications or emails - when critical errors occur. It takes a logger as parameter and will - accumulate log records of all levels until the end of the request (or - `flush()` is called). At that point it delivers all records to the handler - it wraps, but only if the records are unique over a given time period - (60seconds by default). If the records are duplicates they are simply - discarded. The main use of this is in case of critical failure like if your - database is unreachable for example all your requests will fail and that - can result in a lot of notifications being sent. Adding this handler reduces - the amount of notifications to a manageable level. -- _WhatFailureGroupHandler_: This handler extends the _GroupHandler_ ignoring - exceptions raised by each child handler. This allows you to ignore issues - where a remote tcp connection may have died but you do not want your entire - application to crash and may wish to continue to log to other handlers. -- _BufferHandler_: This handler will buffer all the log records it receives - until `close()` is called at which point it will call `handleBatch()` on the - handler it wraps with all the log messages at once. This is very useful to - send an email with all records at once for example instead of having one mail - for every log record. -- _GroupHandler_: This handler groups other handlers. Every record received is - sent to all the handlers it is configured with. -- _FilterHandler_: This handler only lets records of the given levels through - to the wrapped handler. -- _SamplingHandler_: Wraps around another handler and lets you sample records - if you only want to store some of them. -- _NullHandler_: Any record it can handle will be thrown away. This can be used - to put on top of an existing handler stack to disable it temporarily. -- _PsrHandler_: Can be used to forward log records to an existing PSR-3 logger -- _TestHandler_: Used for testing, it records everything that is sent to it and - has accessors to read out the information. -- _HandlerWrapper_: A simple handler wrapper you can inherit from to create - your own wrappers easily. - -## Formatters - -- _LineFormatter_: Formats a log record into a one-line string. -- _HtmlFormatter_: Used to format log records into a human readable html table, mainly suitable for emails. -- _NormalizerFormatter_: Normalizes objects/resources down to strings so a record can easily be serialized/encoded. -- _ScalarFormatter_: Used to format log records into an associative array of scalar values. -- _JsonFormatter_: Encodes a log record into json. -- _WildfireFormatter_: Used to format log records into the Wildfire/FirePHP protocol, only useful for the FirePHPHandler. -- _ChromePHPFormatter_: Used to format log records into the ChromePHP format, only useful for the ChromePHPHandler. -- _GelfMessageFormatter_: Used to format log records into Gelf message instances, only useful for the GelfHandler. -- _LogstashFormatter_: Used to format log records into [logstash](http://logstash.net/) event json, useful for any handler listed under inputs [here](http://logstash.net/docs/latest). -- _ElasticaFormatter_: Used to format log records into an Elastica\Document object, only useful for the ElasticSearchHandler. -- _LogglyFormatter_: Used to format log records into Loggly messages, only useful for the LogglyHandler. -- _FlowdockFormatter_: Used to format log records into Flowdock messages, only useful for the FlowdockHandler. -- _MongoDBFormatter_: Converts \DateTime instances to \MongoDate and objects recursively to arrays, only useful with the MongoDBHandler. - -## Processors - -- _PsrLogMessageProcessor_: Processes a log record's message according to PSR-3 rules, replacing `{foo}` with the value from `$context['foo']`. -- _IntrospectionProcessor_: Adds the line/file/class/method from which the log call originated. -- _WebProcessor_: Adds the current request URI, request method and client IP to a log record. -- _MemoryUsageProcessor_: Adds the current memory usage to a log record. -- _MemoryPeakUsageProcessor_: Adds the peak memory usage to a log record. -- _ProcessIdProcessor_: Adds the process id to a log record. -- _UidProcessor_: Adds a unique identifier to a log record. -- _GitProcessor_: Adds the current git branch and commit to a log record. -- _TagProcessor_: Adds an array of predefined tags to a log record. - -## Third Party Packages - -Third party handlers, formatters and processors are -[listed in the wiki](https://github.com/Seldaek/monolog/wiki/Third-Party-Packages). You -can also add your own there if you publish one. - -← [Usage](01-usage.md) | [Utility classes](03-utilities.md) → diff --git a/vendor/monolog/monolog/doc/03-utilities.md b/vendor/monolog/monolog/doc/03-utilities.md deleted file mode 100644 index fd3fd0e..0000000 --- a/vendor/monolog/monolog/doc/03-utilities.md +++ /dev/null @@ -1,15 +0,0 @@ -# Utilities - -- _Registry_: The `Monolog\Registry` class lets you configure global loggers that you - can then statically access from anywhere. It is not really a best practice but can - help in some older codebases or for ease of use. -- _ErrorHandler_: The `Monolog\ErrorHandler` class allows you to easily register - a Logger instance as an exception handler, error handler or fatal error handler. -- _SignalHandler_: The `Monolog\SignalHandler` class allows you to easily register - a Logger instance as a POSIX signal handler. -- _ErrorLevelActivationStrategy_: Activates a FingersCrossedHandler when a certain log - level is reached. -- _ChannelLevelActivationStrategy_: Activates a FingersCrossedHandler when a certain - log level is reached, depending on which channel received the log record. - -← [Handlers, Formatters and Processors](02-handlers-formatters-processors.md) | [Extending Monolog](04-extending.md) → diff --git a/vendor/monolog/monolog/doc/04-extending.md b/vendor/monolog/monolog/doc/04-extending.md deleted file mode 100644 index ebd9104..0000000 --- a/vendor/monolog/monolog/doc/04-extending.md +++ /dev/null @@ -1,76 +0,0 @@ -# Extending Monolog - -Monolog is fully extensible, allowing you to adapt your logger to your needs. - -## Writing your own handler - -Monolog provides many built-in handlers. But if the one you need does not -exist, you can write it and use it in your logger. The only requirement is -to implement `Monolog\Handler\HandlerInterface`. - -Let's write a PDOHandler to log records to a database. We will extend the -abstract class provided by Monolog to keep things DRY. - -```php -pdo = $pdo; - parent::__construct($level, $bubble); - } - - protected function write(array $record) - { - if (!$this->initialized) { - $this->initialize(); - } - - $this->statement->execute(array( - 'channel' => $record['channel'], - 'level' => $record['level'], - 'message' => $record['formatted'], - 'time' => $record['datetime']->format('U'), - )); - } - - private function initialize() - { - $this->pdo->exec( - 'CREATE TABLE IF NOT EXISTS monolog ' - .'(channel VARCHAR(255), level INTEGER, message LONGTEXT, time INTEGER UNSIGNED)' - ); - $this->statement = $this->pdo->prepare( - 'INSERT INTO monolog (channel, level, message, time) VALUES (:channel, :level, :message, :time)' - ); - - $this->initialized = true; - } -} -``` - -You can now use this handler in your logger: - -```php -pushHandler(new PDOHandler(new PDO('sqlite:logs.sqlite'))); - -// You can now use your logger -$logger->addInfo('My logger is now ready'); -``` - -The `Monolog\Handler\AbstractProcessingHandler` class provides most of the -logic needed for the handler, including the use of processors and the formatting -of the record (which is why we use ``$record['formatted']`` instead of ``$record['message']``). - -← [Utility classes](03-utilities.md) diff --git a/vendor/monolog/monolog/doc/sockets.md b/vendor/monolog/monolog/doc/sockets.md deleted file mode 100644 index ea9cf0e..0000000 --- a/vendor/monolog/monolog/doc/sockets.md +++ /dev/null @@ -1,39 +0,0 @@ -Sockets Handler -=============== - -This handler allows you to write your logs to sockets using [fsockopen](http://php.net/fsockopen) -or [pfsockopen](http://php.net/pfsockopen). - -Persistent sockets are mainly useful in web environments where you gain some performance not closing/opening -the connections between requests. - -You can use a `unix://` prefix to access unix sockets and `udp://` to open UDP sockets instead of the default TCP. - -Basic Example -------------- - -```php -setPersistent(true); - -// Now add the handler -$logger->pushHandler($handler, Logger::DEBUG); - -// You can now use your logger -$logger->addInfo('My logger is now ready'); - -``` - -In this example, using syslog-ng, you should see the log on the log server: - - cweb1 [2012-02-26 00:12:03] my_logger.INFO: My logger is now ready [] [] - diff --git a/vendor/monolog/monolog/phpunit.xml.dist b/vendor/monolog/monolog/phpunit.xml.dist deleted file mode 100644 index 20d82b6..0000000 --- a/vendor/monolog/monolog/phpunit.xml.dist +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - tests/Monolog/ - - - - - - src/Monolog/ - - - - - - - diff --git a/vendor/monolog/monolog/src/Monolog/DateTimeImmutable.php b/vendor/monolog/monolog/src/Monolog/DateTimeImmutable.php new file mode 100644 index 0000000..6a1ba9b --- /dev/null +++ b/vendor/monolog/monolog/src/Monolog/DateTimeImmutable.php @@ -0,0 +1,49 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Monolog; + +use DateTimeZone; + +/** + * Overrides default json encoding of date time objects + * + * @author Menno Holtkamp + * @author Jordi Boggiano + */ +class DateTimeImmutable extends \DateTimeImmutable implements \JsonSerializable +{ + /** + * @var bool + */ + private $useMicroseconds; + + public function __construct(bool $useMicroseconds, ?DateTimeZone $timezone = null) + { + $this->useMicroseconds = $useMicroseconds; + + parent::__construct('now', $timezone); + } + + public function jsonSerialize(): string + { + if ($this->useMicroseconds) { + return $this->format('Y-m-d\TH:i:s.uP'); + } + + return $this->format('Y-m-d\TH:i:sP'); + } + + public function __toString(): string + { + return $this->jsonSerialize(); + } +} diff --git a/vendor/monolog/monolog/src/Monolog/ErrorHandler.php b/vendor/monolog/monolog/src/Monolog/ErrorHandler.php index adc55bd..2643fdb 100644 --- a/vendor/monolog/monolog/src/Monolog/ErrorHandler.php +++ b/vendor/monolog/monolog/src/Monolog/ErrorHandler.php @@ -1,4 +1,4 @@ -registerErrorHandler($errorLevelMap); } - if ($exceptionLevel !== false) { - $handler->registerExceptionHandler($exceptionLevel); + if ($exceptionLevelMap !== false) { + $handler->registerExceptionHandler($exceptionLevelMap); } if ($fatalLevel !== false) { $handler->registerFatalHandler($fatalLevel); @@ -77,38 +72,61 @@ class ErrorHandler return $handler; } - public function registerExceptionHandler($level = null, $callPrevious = true) + public function registerExceptionHandler($levelMap = [], $callPrevious = true): self { - $prev = set_exception_handler(array($this, 'handleException')); - $this->uncaughtExceptionLevel = $level; + $prev = set_exception_handler([$this, 'handleException']); + $this->uncaughtExceptionLevelMap = $levelMap; + foreach ($this->defaultExceptionLevelMap() as $class => $level) { + if (!isset($this->uncaughtExceptionLevelMap[$class])) { + $this->uncaughtExceptionLevelMap[$class] = $level; + } + } if ($callPrevious && $prev) { $this->previousExceptionHandler = $prev; } + + return $this; } - public function registerErrorHandler(array $levelMap = array(), $callPrevious = true, $errorTypes = -1, $handleOnlyReportedErrors = true) + public function registerErrorHandler(array $levelMap = [], $callPrevious = true, $errorTypes = -1, $handleOnlyReportedErrors = true): self { - $prev = set_error_handler(array($this, 'handleError'), $errorTypes); + $prev = set_error_handler([$this, 'handleError'], $errorTypes); $this->errorLevelMap = array_replace($this->defaultErrorLevelMap(), $levelMap); if ($callPrevious) { $this->previousErrorHandler = $prev ?: true; } $this->handleOnlyReportedErrors = $handleOnlyReportedErrors; + + return $this; } - public function registerFatalHandler($level = null, $reservedMemorySize = 20) + /** + * @param string|null $level a LogLevel::* constant, null to use the default LogLevel::ALERT or false to disable fatal error handling + * @param int $reservedMemorySize Amount of KBs to reserve in memory so that it can be freed when handling fatal errors giving Monolog some room in memory to get its job done + */ + public function registerFatalHandler($level = null, int $reservedMemorySize = 20): self { - register_shutdown_function(array($this, 'handleFatalError')); + register_shutdown_function([$this, 'handleFatalError']); $this->reservedMemory = str_repeat(' ', 1024 * $reservedMemorySize); $this->fatalLevel = $level; $this->hasFatalErrorHandler = true; + + return $this; } - protected function defaultErrorLevelMap() + protected function defaultExceptionLevelMap(): array { - return array( + return [ + 'ParseError' => LogLevel::CRITICAL, + 'Throwable' => LogLevel::ERROR, + ]; + } + + protected function defaultErrorLevelMap(): array + { + return [ E_ERROR => LogLevel::CRITICAL, E_WARNING => LogLevel::WARNING, E_PARSE => LogLevel::ALERT, @@ -124,31 +142,44 @@ class ErrorHandler E_RECOVERABLE_ERROR => LogLevel::ERROR, E_DEPRECATED => LogLevel::NOTICE, E_USER_DEPRECATED => LogLevel::NOTICE, - ); + ]; } /** * @private + * @param \Exception $e */ public function handleException($e) { + $level = LogLevel::ERROR; + foreach ($this->uncaughtExceptionLevelMap as $class => $candidate) { + if ($e instanceof $class) { + $level = $candidate; + break; + } + } + $this->logger->log( - $this->uncaughtExceptionLevel === null ? LogLevel::ERROR : $this->uncaughtExceptionLevel, + $level, sprintf('Uncaught Exception %s: "%s" at %s line %s', Utils::getClass($e), $e->getMessage(), $e->getFile(), $e->getLine()), - array('exception' => $e) + ['exception' => $e] ); if ($this->previousExceptionHandler) { call_user_func($this->previousExceptionHandler, $e); } + if (!headers_sent() && !ini_get('display_errors')) { + http_response_code(500); + } + exit(255); } /** * @private */ - public function handleError($code, $message, $file = '', $line = 0, $context = array()) + public function handleError($code, $message, $file = '', $line = 0, $context = []) { if ($this->handleOnlyReportedErrors && !(error_reporting() & $code)) { return; @@ -156,13 +187,10 @@ class ErrorHandler // fatal error codes are ignored if a fatal error handler is present as well to avoid duplicate log entries if (!$this->hasFatalErrorHandler || !in_array($code, self::$fatalErrors, true)) { - $level = isset($this->errorLevelMap[$code]) ? $this->errorLevelMap[$code] : LogLevel::CRITICAL; - $this->logger->log($level, self::codeToString($code).': '.$message, array('code' => $code, 'message' => $message, 'file' => $file, 'line' => $line)); + $level = $this->errorLevelMap[$code] ?? LogLevel::CRITICAL; + $this->logger->log($level, self::codeToString($code).': '.$message, ['code' => $code, 'message' => $message, 'file' => $file, 'line' => $line]); } else { - // http://php.net/manual/en/function.debug-backtrace.php - // As of 5.3.6, DEBUG_BACKTRACE_IGNORE_ARGS option was added. - // Any version less than 5.3.6 must use the DEBUG_BACKTRACE_IGNORE_ARGS constant value '2'. - $trace = debug_backtrace((PHP_VERSION_ID < 50306) ? 2 : DEBUG_BACKTRACE_IGNORE_ARGS); + $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); array_shift($trace); // Exclude handleError from trace $this->lastFatalTrace = $trace; } @@ -172,6 +200,8 @@ class ErrorHandler } elseif ($this->previousErrorHandler) { return call_user_func($this->previousErrorHandler, $code, $message, $file, $line, $context); } + + return true; } /** @@ -179,27 +209,25 @@ class ErrorHandler */ public function handleFatalError() { - $this->reservedMemory = null; + $this->reservedMemory = ''; $lastError = error_get_last(); if ($lastError && in_array($lastError['type'], self::$fatalErrors, true)) { $this->logger->log( $this->fatalLevel === null ? LogLevel::ALERT : $this->fatalLevel, 'Fatal Error ('.self::codeToString($lastError['type']).'): '.$lastError['message'], - array('code' => $lastError['type'], 'message' => $lastError['message'], 'file' => $lastError['file'], 'line' => $lastError['line'], 'trace' => $this->lastFatalTrace) + ['code' => $lastError['type'], 'message' => $lastError['message'], 'file' => $lastError['file'], 'line' => $lastError['line'], 'trace' => $this->lastFatalTrace] ); if ($this->logger instanceof Logger) { foreach ($this->logger->getHandlers() as $handler) { - if ($handler instanceof AbstractHandler) { - $handler->close(); - } + $handler->close(); } } } } - private static function codeToString($code) + private static function codeToString($code): string { switch ($code) { case E_ERROR: diff --git a/vendor/monolog/monolog/src/Monolog/Formatter/ChromePHPFormatter.php b/vendor/monolog/monolog/src/Monolog/Formatter/ChromePHPFormatter.php index 9beda1e..2b4d649 100644 --- a/vendor/monolog/monolog/src/Monolog/Formatter/ChromePHPFormatter.php +++ b/vendor/monolog/monolog/src/Monolog/Formatter/ChromePHPFormatter.php @@ -1,4 +1,4 @@ - 'log', Logger::INFO => 'info', Logger::NOTICE => 'info', @@ -32,7 +32,7 @@ class ChromePHPFormatter implements FormatterInterface Logger::CRITICAL => 'error', Logger::ALERT => 'error', Logger::EMERGENCY => 'error', - ); + ]; /** * {@inheritdoc} @@ -46,7 +46,7 @@ class ChromePHPFormatter implements FormatterInterface unset($record['extra']['file'], $record['extra']['line']); } - $message = array('message' => $record['message']); + $message = ['message' => $record['message']]; if ($record['context']) { $message['context'] = $record['context']; } @@ -57,17 +57,20 @@ class ChromePHPFormatter implements FormatterInterface $message = reset($message); } - return array( + return [ $record['channel'], $message, $backtrace, $this->logLevels[$record['level']], - ); + ]; } + /** + * {@inheritdoc} + */ public function formatBatch(array $records) { - $formatted = array(); + $formatted = []; foreach ($records as $record) { $formatted[] = $this->format($record); diff --git a/vendor/monolog/monolog/src/Monolog/Formatter/ElasticaFormatter.php b/vendor/monolog/monolog/src/Monolog/Formatter/ElasticaFormatter.php index 4c556cf..c6f3c8e 100644 --- a/vendor/monolog/monolog/src/Monolog/Formatter/ElasticaFormatter.php +++ b/vendor/monolog/monolog/src/Monolog/Formatter/ElasticaFormatter.php @@ -1,4 +1,4 @@ -getDocument($record); } - /** - * Getter index - * @return string - */ - public function getIndex() + public function getIndex(): string { return $this->index; } - /** - * Getter type - * @return string - */ - public function getType() + public function getType(): string { return $this->type; } /** * Convert a log message into an Elastica Document - * - * @param array $record Log message + * @param array $record * @return Document */ - protected function getDocument($record) + protected function getDocument(array $record): Document { $document = new Document(); $document->setData($record); diff --git a/vendor/monolog/monolog/src/Monolog/Formatter/ElasticsearchFormatter.php b/vendor/monolog/monolog/src/Monolog/Formatter/ElasticsearchFormatter.php new file mode 100644 index 0000000..84affef --- /dev/null +++ b/vendor/monolog/monolog/src/Monolog/Formatter/ElasticsearchFormatter.php @@ -0,0 +1,89 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Monolog\Formatter; + +use DateTime; + +/** + * Format a log message into an Elasticsearch record + * + * @author Avtandil Kikabidze + */ +class ElasticsearchFormatter extends NormalizerFormatter +{ + /** + * @var string Elasticsearch index name + */ + protected $index; + + /** + * @var string Elasticsearch record type + */ + protected $type; + + /** + * @param string $index Elasticsearch index name + * @param string $type Elasticsearch record type + */ + public function __construct(string $index, string $type) + { + // Elasticsearch requires an ISO 8601 format date with optional millisecond precision. + parent::__construct(DateTime::ISO8601); + + $this->index = $index; + $this->type = $type; + } + + /** + * {@inheritdoc} + */ + public function format(array $record) + { + $record = parent::format($record); + + return $this->getDocument($record); + } + + /** + * Getter index + * + * @return string + */ + public function getIndex(): string + { + return $this->index; + } + + /** + * Getter type + * + * @return string + */ + public function getType(): string + { + return $this->type; + } + + /** + * Convert a log message into an Elasticsearch record + * + * @param array $record Log message + * @return array + */ + protected function getDocument(array $record): array + { + $record['_index'] = $this->index; + $record['_type'] = $this->type; + + return $record; + } +} diff --git a/vendor/monolog/monolog/src/Monolog/Formatter/FlowdockFormatter.php b/vendor/monolog/monolog/src/Monolog/Formatter/FlowdockFormatter.php index 5094af3..301b74b 100644 --- a/vendor/monolog/monolog/src/Monolog/Formatter/FlowdockFormatter.php +++ b/vendor/monolog/monolog/src/Monolog/Formatter/FlowdockFormatter.php @@ -1,4 +1,4 @@ -source = $source; $this->sourceEmail = $sourceEmail; @@ -41,13 +37,13 @@ class FlowdockFormatter implements FormatterInterface /** * {@inheritdoc} */ - public function format(array $record) + public function format(array $record): array { - $tags = array( + $tags = [ '#logs', '#' . strtolower($record['level_name']), '#' . $record['channel'], - ); + ]; foreach ($record['extra'] as $value) { $tags[] = '#' . $value; @@ -60,14 +56,14 @@ class FlowdockFormatter implements FormatterInterface $this->getShortMessage($record['message']) ); - $record['flowdock'] = array( + $record['flowdock'] = [ 'source' => $this->source, 'from_address' => $this->sourceEmail, 'subject' => $subject, 'content' => $record['message'], 'tags' => $tags, 'project' => $this->source, - ); + ]; return $record; } @@ -75,9 +71,9 @@ class FlowdockFormatter implements FormatterInterface /** * {@inheritdoc} */ - public function formatBatch(array $records) + public function formatBatch(array $records): array { - $formatted = array(); + $formatted = []; foreach ($records as $record) { $formatted[] = $this->format($record); @@ -86,12 +82,7 @@ class FlowdockFormatter implements FormatterInterface return $formatted; } - /** - * @param string $message - * - * @return string - */ - public function getShortMessage($message) + public function getShortMessage(string $message): string { static $hasMbString; diff --git a/vendor/monolog/monolog/src/Monolog/Formatter/FluentdFormatter.php b/vendor/monolog/monolog/src/Monolog/Formatter/FluentdFormatter.php index 46a91ff..f8df185 100644 --- a/vendor/monolog/monolog/src/Monolog/Formatter/FluentdFormatter.php +++ b/vendor/monolog/monolog/src/Monolog/Formatter/FluentdFormatter.php @@ -1,4 +1,4 @@ -levelTag = (bool) $levelTag; + $this->levelTag = $levelTag; } - public function isUsingLevelsInTag() + public function isUsingLevelsInTag(): bool { return $this->levelTag; } - public function format(array $record) + public function format(array $record): string { $tag = $record['channel']; if ($this->levelTag) { $tag .= '.' . strtolower($record['level_name']); } - $message = array( + $message = [ 'message' => $record['message'], 'context' => $record['context'], 'extra' => $record['extra'], - ); + ]; if (!$this->levelTag) { $message['level'] = $record['level']; $message['level_name'] = $record['level_name']; } - return json_encode(array($tag, $record['datetime']->getTimestamp(), $message)); + return json_encode([$tag, $record['datetime']->getTimestamp(), $message]); } - public function formatBatch(array $records) + public function formatBatch(array $records): string { $message = ''; foreach ($records as $record) { diff --git a/vendor/monolog/monolog/src/Monolog/Formatter/FormatterInterface.php b/vendor/monolog/monolog/src/Monolog/Formatter/FormatterInterface.php index b5de751..7442134 100644 --- a/vendor/monolog/monolog/src/Monolog/Formatter/FormatterInterface.php +++ b/vendor/monolog/monolog/src/Monolog/Formatter/FormatterInterface.php @@ -1,4 +1,4 @@ - */ class GelfMessageFormatter extends NormalizerFormatter { - const DEFAULT_MAX_LENGTH = 32766; + protected const DEFAULT_MAX_LENGTH = 32766; /** * @var string the name of the system for the Gelf log message @@ -47,7 +48,7 @@ class GelfMessageFormatter extends NormalizerFormatter /** * Translates Monolog log levels to Graylog2 log priorities. */ - private $logLevels = array( + private $logLevels = [ Logger::DEBUG => 7, Logger::INFO => 6, Logger::NOTICE => 5, @@ -56,15 +57,15 @@ class GelfMessageFormatter extends NormalizerFormatter Logger::CRITICAL => 2, Logger::ALERT => 1, Logger::EMERGENCY => 0, - ); + ]; - public function __construct($systemName = null, $extraPrefix = null, $contextPrefix = 'ctxt_', $maxLength = null) + public function __construct(?string $systemName = null, ?string $extraPrefix = null, string $contextPrefix = 'ctxt_', ?int $maxLength = null) { parent::__construct('U.u'); - $this->systemName = $systemName ?: gethostname(); + $this->systemName = (is_null($systemName) || $systemName === '') ? gethostname() : $systemName; - $this->extraPrefix = $extraPrefix; + $this->extraPrefix = is_null($extraPrefix) ? '' : $extraPrefix; $this->contextPrefix = $contextPrefix; $this->maxLength = is_null($maxLength) ? self::DEFAULT_MAX_LENGTH : $maxLength; } @@ -72,9 +73,14 @@ class GelfMessageFormatter extends NormalizerFormatter /** * {@inheritdoc} */ - public function format(array $record) + public function format(array $record): Message { - $record = parent::format($record); + if (isset($record['context'])) { + $record['context'] = parent::format($record['context']); + } + if (isset($record['extra'])) { + $record['extra'] = parent::format($record['extra']); + } if (!isset($record['datetime'], $record['message'], $record['level'])) { throw new \InvalidArgumentException('The record should at least contain datetime, message and level keys, '.var_export($record, true).' given'); @@ -87,11 +93,11 @@ class GelfMessageFormatter extends NormalizerFormatter ->setHost($this->systemName) ->setLevel($this->logLevels[$record['level']]); - // message length + system name length + 200 for padding / metadata + // message length + system name length + 200 for padding / metadata $len = 200 + strlen((string) $record['message']) + strlen($this->systemName); if ($len > $this->maxLength) { - $message->setShortMessage(substr($record['message'], 0, $this->maxLength)); + $message->setShortMessage(Utils::substr($record['message'], 0, $this->maxLength)); } if (isset($record['channel'])) { @@ -110,8 +116,9 @@ class GelfMessageFormatter extends NormalizerFormatter $val = is_scalar($val) || null === $val ? $val : $this->toJson($val); $len = strlen($this->extraPrefix . $key . $val); if ($len > $this->maxLength) { - $message->setAdditional($this->extraPrefix . $key, substr($val, 0, $this->maxLength)); - break; + $message->setAdditional($this->extraPrefix . $key, Utils::substr($val, 0, $this->maxLength)); + + continue; } $message->setAdditional($this->extraPrefix . $key, $val); } @@ -120,8 +127,9 @@ class GelfMessageFormatter extends NormalizerFormatter $val = is_scalar($val) || null === $val ? $val : $this->toJson($val); $len = strlen($this->contextPrefix . $key . $val); if ($len > $this->maxLength) { - $message->setAdditional($this->contextPrefix . $key, substr($val, 0, $this->maxLength)); - break; + $message->setAdditional($this->contextPrefix . $key, Utils::substr($val, 0, $this->maxLength)); + + continue; } $message->setAdditional($this->contextPrefix . $key, $val); } diff --git a/vendor/monolog/monolog/src/Monolog/Formatter/HtmlFormatter.php b/vendor/monolog/monolog/src/Monolog/Formatter/HtmlFormatter.php index dfc0b4a..3c4e847 100644 --- a/vendor/monolog/monolog/src/Monolog/Formatter/HtmlFormatter.php +++ b/vendor/monolog/monolog/src/Monolog/Formatter/HtmlFormatter.php @@ -1,4 +1,5 @@ - '#cccccc', Logger::INFO => '#468847', Logger::NOTICE => '#3a87ad', @@ -33,12 +34,12 @@ class HtmlFormatter extends NormalizerFormatter Logger::CRITICAL => '#FF7708', Logger::ALERT => '#C12A19', Logger::EMERGENCY => '#000000', - ); + ]; /** - * @param string $dateFormat The format of the timestamp: one supported by DateTime::format + * @param string|null $dateFormat The format of the timestamp: one supported by DateTime::format */ - public function __construct($dateFormat = null) + public function __construct(?string $dateFormat = null) { parent::__construct($dateFormat); } @@ -46,12 +47,11 @@ class HtmlFormatter extends NormalizerFormatter /** * Creates an HTML table row * - * @param string $th Row header content - * @param string $td Row standard cell content - * @param bool $escapeTd false if td content must not be html escaped - * @return string + * @param string $th Row header content + * @param string $td Row standard cell content + * @param bool $escapeTd false if td content must not be html escaped */ - protected function addRow($th, $td = ' ', $escapeTd = true) + protected function addRow(string $th, string $td = ' ', bool $escapeTd = true): string { $th = htmlspecialchars($th, ENT_NOQUOTES, 'UTF-8'); if ($escapeTd) { @@ -68,7 +68,7 @@ class HtmlFormatter extends NormalizerFormatter * @param int $level Error level * @return string */ - protected function addTitle($title, $level) + protected function addTitle(string $title, int $level): string { $title = htmlspecialchars($title, ENT_NOQUOTES, 'UTF-8'); @@ -78,16 +78,16 @@ class HtmlFormatter extends NormalizerFormatter /** * Formats a log record. * - * @param array $record A record to format - * @return mixed The formatted record + * @param array $record A record to format + * @return string The formatted record */ - public function format(array $record) + public function format(array $record): string { $output = $this->addTitle($record['level_name'], $record['level']); $output .= ''; $output .= $this->addRow('Message', (string) $record['message']); - $output .= $this->addRow('Time', $record['datetime']->format($this->dateFormat)); + $output .= $this->addRow('Time', $this->formatDate($record['datetime'])); $output .= $this->addRow('Channel', $record['channel']); if ($record['context']) { $embeddedTable = '
'; @@ -112,10 +112,10 @@ class HtmlFormatter extends NormalizerFormatter /** * Formats a set of log records. * - * @param array $records A set of records to format - * @return mixed The formatted set of records + * @param array $records A set of records to format + * @return string The formatted set of records */ - public function formatBatch(array $records) + public function formatBatch(array $records): string { $message = ''; foreach ($records as $record) { @@ -125,17 +125,14 @@ class HtmlFormatter extends NormalizerFormatter return $message; } - protected function convertToString($data) + protected function convertToString($data): string { if (null === $data || is_scalar($data)) { return (string) $data; } $data = $this->normalize($data); - if (version_compare(PHP_VERSION, '5.4.0', '>=')) { - return json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE); - } - return str_replace('\\/', '/', json_encode($data)); + return json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE); } } diff --git a/vendor/monolog/monolog/src/Monolog/Formatter/JsonFormatter.php b/vendor/monolog/monolog/src/Monolog/Formatter/JsonFormatter.php index 9bd305f..de1f696 100644 --- a/vendor/monolog/monolog/src/Monolog/Formatter/JsonFormatter.php +++ b/vendor/monolog/monolog/src/Monolog/Formatter/JsonFormatter.php @@ -1,4 +1,4 @@ -batchMode = $batchMode; $this->appendNewline = $appendNewline; @@ -51,36 +46,42 @@ class JsonFormatter extends NormalizerFormatter * formatted as a JSON-encoded array. However, for * compatibility with some API endpoints, alternative styles * are available. - * - * @return int */ - public function getBatchMode() + public function getBatchMode(): int { return $this->batchMode; } /** * True if newlines are appended to every formatted record - * - * @return bool */ - public function isAppendingNewlines() + public function isAppendingNewlines(): bool { return $this->appendNewline; } /** * {@inheritdoc} + * + * @suppress PhanTypeComparisonToArray */ - public function format(array $record) + public function format(array $record): string { - return $this->toJson($this->normalize($record), true) . ($this->appendNewline ? "\n" : ''); + $normalized = $this->normalize($record); + if (isset($normalized['context']) && $normalized['context'] === []) { + $normalized['context'] = new \stdClass; + } + if (isset($normalized['extra']) && $normalized['extra'] === []) { + $normalized['extra'] = new \stdClass; + } + + return $this->toJson($normalized, true) . ($this->appendNewline ? "\n" : ''); } /** * {@inheritdoc} */ - public function formatBatch(array $records) + public function formatBatch(array $records): string { switch ($this->batchMode) { case static::BATCH_MODE_NEWLINES: @@ -92,21 +93,15 @@ class JsonFormatter extends NormalizerFormatter } } - /** - * @param bool $include - */ - public function includeStacktraces($include = true) + public function includeStacktraces(bool $include = true) { $this->includeStacktraces = $include; } /** * Return a JSON-encoded array of records. - * - * @param array $records - * @return string */ - protected function formatBatchJson(array $records) + protected function formatBatchJson(array $records): string { return $this->toJson($this->normalize($records), true); } @@ -114,11 +109,8 @@ class JsonFormatter extends NormalizerFormatter /** * Use new lines to separate records instead of a * JSON-encoded array. - * - * @param array $records - * @return string */ - protected function formatBatchNewlines(array $records) + protected function formatBatchNewlines(array $records): string { $instance = $this; @@ -139,30 +131,30 @@ class JsonFormatter extends NormalizerFormatter * * @return mixed */ - protected function normalize($data, $depth = 0) + protected function normalize($data, int $depth = 0) { - if ($depth > 9) { - return 'Over 9 levels deep, aborting normalization'; + if ($depth > $this->maxNormalizeDepth) { + return 'Over '.$this->maxNormalizeDepth.' levels deep, aborting normalization'; } if (is_array($data) || $data instanceof \Traversable) { - $normalized = array(); + $normalized = []; $count = 1; foreach ($data as $key => $value) { - if ($count++ > 1000) { - $normalized['...'] = 'Over 1000 items ('.count($data).' total), aborting normalization'; + if ($count++ > $this->maxNormalizeItemCount) { + $normalized['...'] = 'Over '.$this->maxNormalizeItemCount.' items ('.count($data).' total), aborting normalization'; break; } - $normalized[$key] = $this->normalize($value, $depth+1); + $normalized[$key] = $this->normalize($value, $depth + 1); } return $normalized; } - if ($data instanceof Exception || $data instanceof Throwable) { - return $this->normalizeException($data); + if ($data instanceof Throwable) { + return $this->normalizeException($data, $depth); } return $data; @@ -171,42 +163,12 @@ class JsonFormatter extends NormalizerFormatter /** * Normalizes given exception with or without its own stack trace based on * `includeStacktraces` property. - * - * @param Exception|Throwable $e - * - * @return array */ - protected function normalizeException($e) + protected function normalizeException(Throwable $e, int $depth = 0): array { - // TODO 2.0 only check for Throwable - if (!$e instanceof Exception && !$e instanceof Throwable) { - throw new \InvalidArgumentException('Exception/Throwable expected, got '.gettype($e).' / '.Utils::getClass($e)); - } - - $data = array( - 'class' => Utils::getClass($e), - 'message' => $e->getMessage(), - 'code' => $e->getCode(), - 'file' => $e->getFile().':'.$e->getLine(), - ); - - if ($this->includeStacktraces) { - $trace = $e->getTrace(); - foreach ($trace as $frame) { - if (isset($frame['file'])) { - $data['trace'][] = $frame['file'].':'.$frame['line']; - } elseif (isset($frame['function']) && $frame['function'] === '{closure}') { - // We should again normalize the frames, because it might contain invalid items - $data['trace'][] = $frame['function']; - } else { - // We should again normalize the frames, because it might contain invalid items - $data['trace'][] = $this->normalize($frame); - } - } - } - - if ($previous = $e->getPrevious()) { - $data['previous'] = $this->normalizeException($previous); + $data = parent::normalizeException($e, $depth); + if (!$this->includeStacktraces) { + unset($data['trace']); } return $data; diff --git a/vendor/monolog/monolog/src/Monolog/Formatter/LineFormatter.php b/vendor/monolog/monolog/src/Monolog/Formatter/LineFormatter.php index f98e1a6..8a7b390 100644 --- a/vendor/monolog/monolog/src/Monolog/Formatter/LineFormatter.php +++ b/vendor/monolog/monolog/src/Monolog/Formatter/LineFormatter.php @@ -1,4 +1,4 @@ -format = $format ?: static::SIMPLE_FORMAT; + $this->format = $format === null ? static::SIMPLE_FORMAT : $format; $this->allowInlineLineBreaks = $allowInlineLineBreaks; $this->ignoreEmptyContextAndExtra = $ignoreEmptyContextAndExtra; parent::__construct($dateFormat); } - public function includeStacktraces($include = true) + public function includeStacktraces(bool $include = true) { $this->includeStacktraces = $include; if ($this->includeStacktraces) { @@ -52,12 +52,12 @@ class LineFormatter extends NormalizerFormatter } } - public function allowInlineLineBreaks($allow = true) + public function allowInlineLineBreaks(bool $allow = true) { $this->allowInlineLineBreaks = $allow; } - public function ignoreEmptyContextAndExtra($ignore = true) + public function ignoreEmptyContextAndExtra(bool $ignore = true) { $this->ignoreEmptyContextAndExtra = $ignore; } @@ -65,7 +65,7 @@ class LineFormatter extends NormalizerFormatter /** * {@inheritdoc} */ - public function format(array $record) + public function format(array $record): string { $vars = parent::format($record); @@ -78,7 +78,6 @@ class LineFormatter extends NormalizerFormatter } } - foreach ($vars['context'] as $var => $val) { if (false !== strpos($output, '%context.'.$var.'%')) { $output = str_replace('%context.'.$var.'%', $this->stringify($val), $output); @@ -112,7 +111,7 @@ class LineFormatter extends NormalizerFormatter return $output; } - public function formatBatch(array $records) + public function formatBatch(array $records): string { $message = ''; foreach ($records as $record) { @@ -122,34 +121,28 @@ class LineFormatter extends NormalizerFormatter return $message; } - public function stringify($value) + public function stringify($value): string { return $this->replaceNewlines($this->convertToString($value)); } - protected function normalizeException($e) + /** + * @suppress PhanParamSignatureMismatch + */ + protected function normalizeException(\Throwable $e, int $depth = 0): string { - // TODO 2.0 only check for Throwable - if (!$e instanceof \Exception && !$e instanceof \Throwable) { - throw new \InvalidArgumentException('Exception/Throwable expected, got '.gettype($e).' / '.Utils::getClass($e)); - } + $str = $this->formatException($e); - $previousText = ''; if ($previous = $e->getPrevious()) { do { - $previousText .= ', '.Utils::getClass($previous).'(code: '.$previous->getCode().'): '.$previous->getMessage().' at '.$previous->getFile().':'.$previous->getLine(); + $str .= "\n[previous exception] " . $this->formatException($previous); } while ($previous = $previous->getPrevious()); } - $str = '[object] ('.Utils::getClass($e).'(code: '.$e->getCode().'): '.$e->getMessage().' at '.$e->getFile().':'.$e->getLine().$previousText.')'; - if ($this->includeStacktraces) { - $str .= "\n[stacktrace]\n".$e->getTraceAsString()."\n"; - } - return $str; } - protected function convertToString($data) + protected function convertToString($data): string { if (null === $data || is_bool($data)) { return var_export($data, true); @@ -159,14 +152,10 @@ class LineFormatter extends NormalizerFormatter return (string) $data; } - if (version_compare(PHP_VERSION, '5.4.0', '>=')) { - return $this->toJson($data, true); - } - - return str_replace('\\/', '/', @json_encode($data)); + return (string) $this->toJson($data, true); } - protected function replaceNewlines($str) + protected function replaceNewlines(string $str): string { if ($this->allowInlineLineBreaks) { if (0 === strpos($str, '{')) { @@ -176,6 +165,31 @@ class LineFormatter extends NormalizerFormatter return $str; } - return str_replace(array("\r\n", "\r", "\n"), ' ', $str); + return str_replace(["\r\n", "\r", "\n"], ' ', $str); + } + + private function formatException(\Throwable $e): string + { + $str = '[object] (' . Utils::getClass($e) . '(code: ' . $e->getCode(); + if ($e instanceof \SoapFault) { + if (isset($e->faultcode)) { + $str .= ' faultcode: ' . $e->faultcode; + } + + if (isset($e->faultactor)) { + $str .= ' faultactor: ' . $e->faultactor; + } + + if (isset($e->detail)) { + $str .= ' detail: ' . $e->detail; + } + } + $str .= '): ' . $e->getMessage() . ' at ' . $e->getFile() . ':' . $e->getLine() . ')'; + + if ($this->includeStacktraces) { + $str .= "\n[stacktrace]\n" . $e->getTraceAsString() . "\n"; + } + + return $str; } } diff --git a/vendor/monolog/monolog/src/Monolog/Formatter/LogglyFormatter.php b/vendor/monolog/monolog/src/Monolog/Formatter/LogglyFormatter.php index 401859b..29841aa 100644 --- a/vendor/monolog/monolog/src/Monolog/Formatter/LogglyFormatter.php +++ b/vendor/monolog/monolog/src/Monolog/Formatter/LogglyFormatter.php @@ -1,4 +1,4 @@ -format("Y-m-d\TH:i:s.uO"); - // TODO 2.0 unset the 'datetime' parameter, retained for BC + unset($record["datetime"]); } return parent::format($record); diff --git a/vendor/monolog/monolog/src/Monolog/Formatter/LogmaticFormatter.php b/vendor/monolog/monolog/src/Monolog/Formatter/LogmaticFormatter.php new file mode 100644 index 0000000..b0451ab --- /dev/null +++ b/vendor/monolog/monolog/src/Monolog/Formatter/LogmaticFormatter.php @@ -0,0 +1,66 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Monolog\Formatter; + +/** + * Encodes message information into JSON in a format compatible with Logmatic. + * + * @author Julien Breux + */ +class LogmaticFormatter extends JsonFormatter +{ + protected const MARKERS = ["sourcecode", "php"]; + + /** + * @var string + */ + protected $hostname = ''; + + /** + * @var string + */ + protected $appname = ''; + + public function setHostname(string $hostname): self + { + $this->hostname = $hostname; + + return $this; + } + + public function setAppname(string $appname): self + { + $this->appname = $appname; + + return $this; + } + + /** + * Appends the 'hostname' and 'appname' parameter for indexing by Logmatic. + * + * @see http://doc.logmatic.io/docs/basics-to-send-data + * @see \Monolog\Formatter\JsonFormatter::format() + */ + public function format(array $record): string + { + if (!empty($this->hostname)) { + $record["hostname"] = $this->hostname; + } + if (!empty($this->appname)) { + $record["appname"] = $this->appname; + } + + $record["@marker"] = static::MARKERS; + + return parent::format($record); + } +} diff --git a/vendor/monolog/monolog/src/Monolog/Formatter/LogstashFormatter.php b/vendor/monolog/monolog/src/Monolog/Formatter/LogstashFormatter.php index 8f83bec..563d97d 100644 --- a/vendor/monolog/monolog/src/Monolog/Formatter/LogstashFormatter.php +++ b/vendor/monolog/monolog/src/Monolog/Formatter/LogstashFormatter.php @@ -1,4 +1,4 @@ - */ class LogstashFormatter extends NormalizerFormatter { - const V0 = 0; - const V1 = 1; - /** * @var string the name of the system for the Logstash log message, used to fill the @source field */ @@ -35,108 +32,47 @@ class LogstashFormatter extends NormalizerFormatter protected $applicationName; /** - * @var string a prefix for 'extra' fields from the Monolog record (optional) + * @var string the key for 'extra' fields from the Monolog record */ - protected $extraPrefix; + protected $extraKey; /** - * @var string a prefix for 'context' fields from the Monolog record (optional) + * @var string the key for 'context' fields from the Monolog record */ - protected $contextPrefix; + protected $contextKey; /** - * @var int logstash format version to use + * @param string $applicationName The application that sends the data, used as the "type" field of logstash + * @param string|null $systemName The system/machine name, used as the "source" field of logstash, defaults to the hostname of the machine + * @param string $extraKey The key for extra keys inside logstash "fields", defaults to extra + * @param string $contextKey The key for context keys inside logstash "fields", defaults to context */ - protected $version; - - /** - * @param string $applicationName the application that sends the data, used as the "type" field of logstash - * @param string $systemName the system/machine name, used as the "source" field of logstash, defaults to the hostname of the machine - * @param string $extraPrefix prefix for extra keys inside logstash "fields" - * @param string $contextPrefix prefix for context keys inside logstash "fields", defaults to ctxt_ - * @param int $version the logstash format version to use, defaults to 0 - */ - public function __construct($applicationName, $systemName = null, $extraPrefix = null, $contextPrefix = 'ctxt_', $version = self::V0) + public function __construct(string $applicationName, ?string $systemName = null, string $extraKey = 'extra', string $contextKey = 'context') { // logstash requires a ISO 8601 format date with optional millisecond precision. parent::__construct('Y-m-d\TH:i:s.uP'); - $this->systemName = $systemName ?: gethostname(); + $this->systemName = $systemName === null ? gethostname() : $systemName; $this->applicationName = $applicationName; - $this->extraPrefix = $extraPrefix; - $this->contextPrefix = $contextPrefix; - $this->version = $version; + $this->extraKey = $extraKey; + $this->contextKey = $contextKey; } /** * {@inheritdoc} */ - public function format(array $record) + public function format(array $record): string { $record = parent::format($record); - if ($this->version === self::V1) { - $message = $this->formatV1($record); - } else { - $message = $this->formatV0($record); - } - - return $this->toJson($message) . "\n"; - } - - protected function formatV0(array $record) - { if (empty($record['datetime'])) { $record['datetime'] = gmdate('c'); } - $message = array( - '@timestamp' => $record['datetime'], - '@source' => $this->systemName, - '@fields' => array(), - ); - if (isset($record['message'])) { - $message['@message'] = $record['message']; - } - if (isset($record['channel'])) { - $message['@tags'] = array($record['channel']); - $message['@fields']['channel'] = $record['channel']; - } - if (isset($record['level'])) { - $message['@fields']['level'] = $record['level']; - } - if ($this->applicationName) { - $message['@type'] = $this->applicationName; - } - if (isset($record['extra']['server'])) { - $message['@source_host'] = $record['extra']['server']; - } - if (isset($record['extra']['url'])) { - $message['@source_path'] = $record['extra']['url']; - } - if (!empty($record['extra'])) { - foreach ($record['extra'] as $key => $val) { - $message['@fields'][$this->extraPrefix . $key] = $val; - } - } - if (!empty($record['context'])) { - foreach ($record['context'] as $key => $val) { - $message['@fields'][$this->contextPrefix . $key] = $val; - } - } - - return $message; - } - - protected function formatV1(array $record) - { - if (empty($record['datetime'])) { - $record['datetime'] = gmdate('c'); - } - $message = array( + $message = [ '@timestamp' => $record['datetime'], '@version' => 1, 'host' => $this->systemName, - ); + ]; if (isset($record['message'])) { $message['message'] = $record['message']; } @@ -147,20 +83,19 @@ class LogstashFormatter extends NormalizerFormatter if (isset($record['level_name'])) { $message['level'] = $record['level_name']; } + if (isset($record['level'])) { + $message['monolog_level'] = $record['level']; + } if ($this->applicationName) { $message['type'] = $this->applicationName; } if (!empty($record['extra'])) { - foreach ($record['extra'] as $key => $val) { - $message[$this->extraPrefix . $key] = $val; - } + $message[$this->extraKey] = $record['extra']; } if (!empty($record['context'])) { - foreach ($record['context'] as $key => $val) { - $message[$this->contextPrefix . $key] = $val; - } + $message[$this->contextKey] = $record['context']; } - return $message; + return $this->toJson($message) . "\n"; } } diff --git a/vendor/monolog/monolog/src/Monolog/Formatter/MongoDBFormatter.php b/vendor/monolog/monolog/src/Monolog/Formatter/MongoDBFormatter.php index eb7be84..d38c3ef 100644 --- a/vendor/monolog/monolog/src/Monolog/Formatter/MongoDBFormatter.php +++ b/vendor/monolog/monolog/src/Monolog/Formatter/MongoDBFormatter.php @@ -1,4 +1,4 @@ -maxNestingLevel = max($maxNestingLevel, 0); - $this->exceptionTraceAsString = (bool) $exceptionTraceAsString; + $this->exceptionTraceAsString = $exceptionTraceAsString; + + $this->isLegacyMongoExt = version_compare(phpversion('mongodb'), '1.1.9', '<='); } /** * {@inheritDoc} */ - public function format(array $record) + public function format(array $record): array { return $this->formatArray($record); } @@ -44,7 +48,7 @@ class MongoDBFormatter implements FormatterInterface /** * {@inheritDoc} */ - public function formatBatch(array $records) + public function formatBatch(array $records): array { foreach ($records as $key => $record) { $records[$key] = $this->format($record); @@ -53,13 +57,16 @@ class MongoDBFormatter implements FormatterInterface return $records; } - protected function formatArray(array $record, $nestingLevel = 0) + /** + * @return array|string Array except when max nesting level is reached then a string "[...]" + */ + protected function formatArray(array $record, int $nestingLevel = 0) { if ($this->maxNestingLevel == 0 || $nestingLevel <= $this->maxNestingLevel) { foreach ($record as $name => $value) { - if ($value instanceof \DateTime) { + if ($value instanceof \DateTimeInterface) { $record[$name] = $this->formatDate($value, $nestingLevel + 1); - } elseif ($value instanceof \Exception) { + } elseif ($value instanceof \Throwable) { $record[$name] = $this->formatException($value, $nestingLevel + 1); } elseif (is_array($value)) { $record[$name] = $this->formatArray($value, $nestingLevel + 1); @@ -74,7 +81,7 @@ class MongoDBFormatter implements FormatterInterface return $record; } - protected function formatObject($value, $nestingLevel) + protected function formatObject($value, int $nestingLevel) { $objectVars = get_object_vars($value); $objectVars['class'] = Utils::getClass($value); @@ -82,14 +89,14 @@ class MongoDBFormatter implements FormatterInterface return $this->formatArray($objectVars, $nestingLevel); } - protected function formatException(\Exception $exception, $nestingLevel) + protected function formatException(\Throwable $exception, int $nestingLevel) { - $formattedException = array( + $formattedException = [ 'class' => Utils::getClass($exception), 'message' => $exception->getMessage(), 'code' => $exception->getCode(), 'file' => $exception->getFile() . ':' . $exception->getLine(), - ); + ]; if ($this->exceptionTraceAsString === true) { $formattedException['trace'] = $exception->getTraceAsString(); @@ -100,8 +107,35 @@ class MongoDBFormatter implements FormatterInterface return $this->formatArray($formattedException, $nestingLevel); } - protected function formatDate(\DateTime $value, $nestingLevel) + protected function formatDate(\DateTimeInterface $value, int $nestingLevel): UTCDateTime { - return new \MongoDate($value->getTimestamp()); + if ($this->isLegacyMongoExt) { + return $this->legacyGetMongoDbDateTime($value); + } + + return $this->getMongoDbDateTime($value); + } + + private function getMongoDbDateTime(\DateTimeInterface $value): UTCDateTime + { + return new UTCDateTime((int) (string) floor($value->format('U.u') * 1000)); + } + + /** + * This is needed to support MongoDB Driver v1.19 and below + * + * See https://github.com/mongodb/mongo-php-driver/issues/426 + * + * It can probably be removed in 2.1 or later once MongoDB's 1.2 is released and widely adopted + */ + private function legacyGetMongoDbDateTime(\DateTimeInterface $value): UTCDateTime + { + $milliseconds = floor($value->format('U.u') * 1000); + + $milliseconds = (PHP_INT_SIZE == 8) //64-bit OS? + ? (int) $milliseconds + : (string) $milliseconds; + + return new UTCDateTime($milliseconds); } } diff --git a/vendor/monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php b/vendor/monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php index 6686657..9c42a73 100644 --- a/vendor/monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php +++ b/vendor/monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php @@ -1,4 +1,4 @@ -dateFormat = $dateFormat ?: static::SIMPLE_DATE; + $this->dateFormat = null === $dateFormat ? static::SIMPLE_DATE : $dateFormat; if (!function_exists('json_encode')) { throw new \RuntimeException('PHP\'s json extension is required to use Monolog\'s NormalizerFormatter'); } @@ -56,10 +61,58 @@ class NormalizerFormatter implements FormatterInterface return $records; } - protected function normalize($data, $depth = 0) + /** + * The maximum number of normalization levels to go through + */ + public function getMaxNormalizeDepth(): int { - if ($depth > 9) { - return 'Over 9 levels deep, aborting normalization'; + return $this->maxNormalizeDepth; + } + + public function setMaxNormalizeDepth(int $maxNormalizeDepth): self + { + $this->maxNormalizeDepth = $maxNormalizeDepth; + + return $this; + } + + /** + * The maximum number of items to normalize per level + */ + public function getMaxNormalizeItemCount(): int + { + return $this->maxNormalizeItemCount; + } + + public function setMaxNormalizeItemCount(int $maxNormalizeItemCount): self + { + $this->maxNormalizeItemCount = $maxNormalizeItemCount; + + return $this; + } + + /** + * Enables `json_encode` pretty print. + */ + public function setJsonPrettyPrint(bool $enable): self + { + if ($enable) { + $this->jsonEncodeOptions |= JSON_PRETTY_PRINT; + } else { + $this->jsonEncodeOptions ^= JSON_PRETTY_PRINT; + } + + return $this; + } + + /** + * @param mixed $data + * @return int|bool|string|null|array + */ + protected function normalize($data, int $depth = 0) + { + if ($depth > $this->maxNormalizeDepth) { + return 'Over ' . $this->maxNormalizeDepth . ' levels deep, aborting normalization'; } if (null === $data || is_scalar($data)) { @@ -76,62 +129,69 @@ class NormalizerFormatter implements FormatterInterface } if (is_array($data)) { - $normalized = array(); + $normalized = []; $count = 1; foreach ($data as $key => $value) { - if ($count++ > 1000) { - $normalized['...'] = 'Over 1000 items ('.count($data).' total), aborting normalization'; + if ($count++ > $this->maxNormalizeItemCount) { + $normalized['...'] = 'Over ' . $this->maxNormalizeItemCount . ' items ('.count($data).' total), aborting normalization'; break; } - $normalized[$key] = $this->normalize($value, $depth+1); + $normalized[$key] = $this->normalize($value, $depth + 1); } return $normalized; } - if ($data instanceof \DateTime) { - return $data->format($this->dateFormat); + if ($data instanceof \DateTimeInterface) { + return $this->formatDate($data); } if (is_object($data)) { - // TODO 2.0 only check for Throwable - if ($data instanceof Exception || (PHP_VERSION_ID > 70000 && $data instanceof \Throwable)) { - return $this->normalizeException($data); + if ($data instanceof Throwable) { + return $this->normalizeException($data, $depth); } - // non-serializable objects that implement __toString stringified - if (method_exists($data, '__toString') && !$data instanceof \JsonSerializable) { + if ($data instanceof \JsonSerializable) { + $value = $data->jsonSerialize(); + } elseif (method_exists($data, '__toString')) { $value = $data->__toString(); } else { - // the rest is json-serialized in some way - $value = $this->toJson($data, true); + // the rest is normalized by json encoding and decoding it + $encoded = $this->toJson($data, true); + if ($encoded === false) { + $value = 'JSON_ERROR'; + } else { + $value = json_decode($encoded, true); + } } - return sprintf("[object] (%s: %s)", Utils::getClass($data), $value); + return [Utils::getClass($data) => $value]; } if (is_resource($data)) { - return sprintf('[resource] (%s)', get_resource_type($data)); + return sprintf('[resource(%s)]', get_resource_type($data)); } return '[unknown('.gettype($data).')]'; } - protected function normalizeException($e) + /** + * @return array + */ + protected function normalizeException(Throwable $e, int $depth = 0) { - // TODO 2.0 only check for Throwable - if (!$e instanceof Exception && !$e instanceof \Throwable) { - throw new \InvalidArgumentException('Exception/Throwable expected, got '.gettype($e).' / '.Utils::getClass($e)); + if ($e instanceof \JsonSerializable) { + return (array) $e->jsonSerialize(); } - $data = array( + $data = [ 'class' => Utils::getClass($e), 'message' => $e->getMessage(), 'code' => $e->getCode(), 'file' => $e->getFile().':'.$e->getLine(), - ); + ]; if ($e instanceof \SoapFault) { if (isset($e->faultcode)) { @@ -151,28 +211,11 @@ class NormalizerFormatter implements FormatterInterface foreach ($trace as $frame) { if (isset($frame['file'])) { $data['trace'][] = $frame['file'].':'.$frame['line']; - } elseif (isset($frame['function']) && $frame['function'] === '{closure}') { - // Simplify closures handling - $data['trace'][] = $frame['function']; - } else { - if (isset($frame['args'])) { - // Make sure that objects present as arguments are not serialized nicely but rather only - // as a class name to avoid any unexpected leak of sensitive information - $frame['args'] = array_map(function ($arg) { - if (is_object($arg) && !($arg instanceof \DateTime || $arg instanceof \DateTimeInterface)) { - return sprintf("[object] (%s)", Utils::getClass($arg)); - } - - return $arg; - }, $frame['args']); - } - // We should again normalize the frames, because it might contain invalid items - $data['trace'][] = $this->toJson($this->normalize($frame), true); } } if ($previous = $e->getPrevious()) { - $data['previous'] = $this->normalizeException($previous); + $data['previous'] = $this->normalizeException($previous, $depth + 1); } return $data; @@ -182,11 +225,10 @@ class NormalizerFormatter implements FormatterInterface * Return the JSON representation of a value * * @param mixed $data - * @param bool $ignoreErrors * @throws \RuntimeException if encoding fails and errors are not ignored - * @return string + * @return string|bool */ - protected function toJson($data, $ignoreErrors = false) + protected function toJson($data, bool $ignoreErrors = false) { // suppress json_encode errors since it's twitchy with some inputs if ($ignoreErrors) { @@ -203,16 +245,12 @@ class NormalizerFormatter implements FormatterInterface } /** - * @param mixed $data - * @return string JSON encoded data or null on failure + * @param mixed $data + * @return string|bool JSON encoded data or false on failure */ private function jsonEncode($data) { - if (version_compare(PHP_VERSION, '5.4.0', '>=')) { - return json_encode($data, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE); - } - - return json_encode($data); + return json_encode($data, $this->jsonEncodeOptions); } /** @@ -220,7 +258,7 @@ class NormalizerFormatter implements FormatterInterface * * If the failure is due to invalid string encoding, try to clean the * input and encode again. If the second encoding attempt fails, the - * inital error is not encoding related or the input can't be cleaned then + * initial error is not encoding related or the input can't be cleaned then * raise a descriptive exception. * * @param int $code return code of json_last_error function @@ -228,7 +266,7 @@ class NormalizerFormatter implements FormatterInterface * @throws \RuntimeException if failure can't be corrected * @return string JSON encoded data after error correction */ - private function handleJsonError($code, $data) + private function handleJsonError(int $code, $data): string { if ($code !== JSON_ERROR_UTF8) { $this->throwEncodeError($code, $data); @@ -237,7 +275,7 @@ class NormalizerFormatter implements FormatterInterface if (is_string($data)) { $this->detectAndCleanUtf8($data); } elseif (is_array($data)) { - array_walk_recursive($data, array($this, 'detectAndCleanUtf8')); + array_walk_recursive($data, [$this, 'detectAndCleanUtf8']); } else { $this->throwEncodeError($code, $data); } @@ -258,7 +296,7 @@ class NormalizerFormatter implements FormatterInterface * @param mixed $data data that was meant to be encoded * @throws \RuntimeException */ - private function throwEncodeError($code, $data) + private function throwEncodeError(int $code, $data) { switch ($code) { case JSON_ERROR_DEPTH: @@ -301,14 +339,37 @@ class NormalizerFormatter implements FormatterInterface if (is_string($data) && !preg_match('//u', $data)) { $data = preg_replace_callback( '/[\x80-\xFF]+/', - function ($m) { return utf8_encode($m[0]); }, + function ($m) { + return utf8_encode($m[0]); + }, $data ); $data = str_replace( - array('¤', '¦', '¨', '´', '¸', '¼', '½', '¾'), - array('€', 'Š', 'š', 'Ž', 'ž', 'Œ', 'œ', 'Ÿ'), + ['¤', '¦', '¨', '´', '¸', '¼', '½', '¾'], + ['€', 'Š', 'š', 'Ž', 'ž', 'Œ', 'œ', 'Ÿ'], $data ); } } + + protected function formatDate(\DateTimeInterface $date) + { + // in case the date format isn't custom then we defer to the custom DateTimeImmutable + // formatting logic, which will pick the right format based on whether useMicroseconds is on + if ($this->dateFormat === self::SIMPLE_DATE && $date instanceof DateTimeImmutable) { + return (string) $date; + } + + return $date->format($this->dateFormat); + } + + protected function addJsonEncodeOption($option) + { + $this->jsonEncodeOptions |= $option; + } + + protected function removeJsonEncodeOption($option) + { + $this->jsonEncodeOptions ^= $option; + } } diff --git a/vendor/monolog/monolog/src/Monolog/Formatter/ScalarFormatter.php b/vendor/monolog/monolog/src/Monolog/Formatter/ScalarFormatter.php index 5d345d5..8d560e7 100644 --- a/vendor/monolog/monolog/src/Monolog/Formatter/ScalarFormatter.php +++ b/vendor/monolog/monolog/src/Monolog/Formatter/ScalarFormatter.php @@ -1,4 +1,4 @@ - $value) { $record[$key] = $this->normalizeValue($value); diff --git a/vendor/monolog/monolog/src/Monolog/Formatter/WildfireFormatter.php b/vendor/monolog/monolog/src/Monolog/Formatter/WildfireFormatter.php index 65dba99..2d96739 100644 --- a/vendor/monolog/monolog/src/Monolog/Formatter/WildfireFormatter.php +++ b/vendor/monolog/monolog/src/Monolog/Formatter/WildfireFormatter.php @@ -1,4 +1,4 @@ - 'LOG', Logger::INFO => 'INFO', Logger::NOTICE => 'INFO', @@ -36,12 +34,12 @@ class WildfireFormatter extends NormalizerFormatter Logger::CRITICAL => 'ERROR', Logger::ALERT => 'ERROR', Logger::EMERGENCY => 'ERROR', - ); + ]; /** * {@inheritdoc} */ - public function format(array $record) + public function format(array $record): string { // Retrieve the line and file if set and remove them from the formatted extra $file = $line = ''; @@ -55,7 +53,7 @@ class WildfireFormatter extends NormalizerFormatter } $record = $this->normalize($record); - $message = array('message' => $record['message']); + $message = ['message' => $record['message']]; $handleError = false; if ($record['context']) { $message['context'] = $record['context']; @@ -69,42 +67,49 @@ class WildfireFormatter extends NormalizerFormatter $message = reset($message); } - if (isset($record['context'][self::TABLE])) { + if (isset($record['context']['table'])) { $type = 'TABLE'; $label = $record['channel'] .': '. $record['message']; - $message = $record['context'][self::TABLE]; + $message = $record['context']['table']; } else { $type = $this->logLevels[$record['level']]; $label = $record['channel']; } // Create JSON object describing the appearance of the message in the console - $json = $this->toJson(array( - array( + $json = $this->toJson([ + [ 'Type' => $type, 'File' => $file, 'Line' => $line, 'Label' => $label, - ), + ], $message, - ), $handleError); + ], $handleError); // The message itself is a serialization of the above JSON object + it's length return sprintf( - '%s|%s|', + '%d|%s|', strlen($json), $json ); } + /** + * {@inheritdoc} + */ public function formatBatch(array $records) { throw new \BadMethodCallException('Batch formatting does not make sense for the WildfireFormatter'); } - protected function normalize($data, $depth = 0) + /** + * {@inheritdoc} + * @suppress PhanTypeMismatchReturn + */ + protected function normalize($data, int $depth = 0) { - if (is_object($data) && !$data instanceof \DateTime) { + if (is_object($data) && !$data instanceof \DateTimeInterface) { return $data; } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/AbstractHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/AbstractHandler.php index 92b9d45..c9405bf 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/AbstractHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/AbstractHandler.php @@ -1,4 +1,4 @@ - */ -abstract class AbstractHandler implements HandlerInterface, ResettableInterface +abstract class AbstractHandler extends Handler implements ResettableInterface { protected $level = Logger::DEBUG; protected $bubble = true; /** - * @var FormatterInterface + * @param int|string $level The minimum logging level at which this handler will be triggered + * @param bool $bubble Whether the messages that are handled can bubble up the stack or not */ - protected $formatter; - protected $processors = array(); - - /** - * @param int $level The minimum logging level at which this handler will be triggered - * @param bool $bubble Whether the messages that are handled can bubble up the stack or not - */ - public function __construct($level = Logger::DEBUG, $bubble = true) + public function __construct($level = Logger::DEBUG, bool $bubble = true) { $this->setLevel($level); $this->bubble = $bubble; @@ -45,84 +37,18 @@ abstract class AbstractHandler implements HandlerInterface, ResettableInterface /** * {@inheritdoc} */ - public function isHandling(array $record) + public function isHandling(array $record): bool { return $record['level'] >= $this->level; } - /** - * {@inheritdoc} - */ - public function handleBatch(array $records) - { - foreach ($records as $record) { - $this->handle($record); - } - } - - /** - * Closes the handler. - * - * This will be called automatically when the object is destroyed - */ - public function close() - { - } - - /** - * {@inheritdoc} - */ - public function pushProcessor($callback) - { - if (!is_callable($callback)) { - throw new \InvalidArgumentException('Processors must be valid callables (callback or object with an __invoke method), '.var_export($callback, true).' given'); - } - array_unshift($this->processors, $callback); - - return $this; - } - - /** - * {@inheritdoc} - */ - public function popProcessor() - { - if (!$this->processors) { - throw new \LogicException('You tried to pop from an empty processor stack.'); - } - - return array_shift($this->processors); - } - - /** - * {@inheritdoc} - */ - public function setFormatter(FormatterInterface $formatter) - { - $this->formatter = $formatter; - - return $this; - } - - /** - * {@inheritdoc} - */ - public function getFormatter() - { - if (!$this->formatter) { - $this->formatter = $this->getDefaultFormatter(); - } - - return $this->formatter; - } - /** * Sets minimum logging level at which this handler will be triggered. * * @param int|string $level Level or level name * @return self */ - public function setLevel($level) + public function setLevel($level): self { $this->level = Logger::toMonologLevel($level); @@ -134,7 +60,7 @@ abstract class AbstractHandler implements HandlerInterface, ResettableInterface * * @return int */ - public function getLevel() + public function getLevel(): int { return $this->level; } @@ -146,7 +72,7 @@ abstract class AbstractHandler implements HandlerInterface, ResettableInterface * false means that bubbling is not permitted. * @return self */ - public function setBubble($bubble) + public function setBubble(bool $bubble): self { $this->bubble = $bubble; @@ -159,38 +85,12 @@ abstract class AbstractHandler implements HandlerInterface, ResettableInterface * @return bool true means that this handler allows bubbling. * false means that bubbling is not permitted. */ - public function getBubble() + public function getBubble(): bool { return $this->bubble; } - public function __destruct() - { - try { - $this->close(); - } catch (\Exception $e) { - // do nothing - } catch (\Throwable $e) { - // do nothing - } - } - public function reset() { - foreach ($this->processors as $processor) { - if ($processor instanceof ResettableInterface) { - $processor->reset(); - } - } - } - - /** - * Gets the default formatter. - * - * @return FormatterInterface - */ - protected function getDefaultFormatter() - { - return new LineFormatter(); } } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/AbstractProcessingHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/AbstractProcessingHandler.php index e1e8953..1100260 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/AbstractProcessingHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/AbstractProcessingHandler.php @@ -1,4 +1,4 @@ - * @author Christophe Coevoet */ -abstract class AbstractProcessingHandler extends AbstractHandler +abstract class AbstractProcessingHandler extends AbstractHandler implements ProcessableHandlerInterface, FormattableHandlerInterface { + use ProcessableHandlerTrait; + use FormattableHandlerTrait; + /** * {@inheritdoc} */ - public function handle(array $record) + public function handle(array $record): bool { if (!$this->isHandling($record)) { return false; } - $record = $this->processRecord($record); + if ($this->processors) { + $record = $this->processRecord($record); + } $record['formatted'] = $this->getFormatter()->format($record); @@ -43,26 +46,13 @@ abstract class AbstractProcessingHandler extends AbstractHandler /** * Writes the record down to the log of the implementing handler - * - * @param array $record - * @return void */ - abstract protected function write(array $record); + abstract protected function write(array $record): void; - /** - * Processes a record. - * - * @param array $record - * @return array - */ - protected function processRecord(array $record) + public function reset() { - if ($this->processors) { - foreach ($this->processors as $processor) { - $record = call_user_func($processor, $record); - } - } + parent::reset(); - return $record; + $this->resetProcessors(); } } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/AbstractSyslogHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/AbstractSyslogHandler.php index 8c76aca..b7f249d 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/AbstractSyslogHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/AbstractSyslogHandler.php @@ -1,4 +1,4 @@ - LOG_DEBUG, Logger::INFO => LOG_INFO, Logger::NOTICE => LOG_NOTICE, @@ -33,12 +34,12 @@ abstract class AbstractSyslogHandler extends AbstractProcessingHandler Logger::CRITICAL => LOG_CRIT, Logger::ALERT => LOG_ALERT, Logger::EMERGENCY => LOG_EMERG, - ); + ]; /** * List of valid log facility names. */ - protected $facilities = array( + protected $facilities = [ 'auth' => LOG_AUTH, 'authpriv' => LOG_AUTHPRIV, 'cron' => LOG_CRON, @@ -50,14 +51,14 @@ abstract class AbstractSyslogHandler extends AbstractProcessingHandler 'syslog' => LOG_SYSLOG, 'user' => LOG_USER, 'uucp' => LOG_UUCP, - ); + ]; /** - * @param mixed $facility - * @param int $level The minimum logging level at which this handler will be triggered - * @param bool $bubble Whether the messages that are handled can bubble up the stack or not + * @param string|int $facility Either one of the names of the keys in $this->facilities, or a LOG_* facility constant + * @param string|int $level The minimum logging level at which this handler will be triggered + * @param bool $bubble Whether the messages that are handled can bubble up the stack or not */ - public function __construct($facility = LOG_USER, $level = Logger::DEBUG, $bubble = true) + public function __construct($facility = LOG_USER, $level = Logger::DEBUG, bool $bubble = true) { parent::__construct($level, $bubble); @@ -82,7 +83,7 @@ abstract class AbstractSyslogHandler extends AbstractProcessingHandler } // convert textual description of facility to syslog constant - if (array_key_exists(strtolower($facility), $this->facilities)) { + if (is_string($facility) && array_key_exists(strtolower($facility), $this->facilities)) { $facility = $this->facilities[strtolower($facility)]; } elseif (!in_array($facility, array_values($this->facilities), true)) { throw new \UnexpectedValueException('Unknown facility value "'.$facility.'" given'); @@ -94,7 +95,7 @@ abstract class AbstractSyslogHandler extends AbstractProcessingHandler /** * {@inheritdoc} */ - protected function getDefaultFormatter() + protected function getDefaultFormatter(): FormatterInterface { return new LineFormatter('%channel%.%level_name%: %message% %context% %extra%'); } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/AmqpHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/AmqpHandler.php index e5a46bc..33fffcc 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/AmqpHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/AmqpHandler.php @@ -1,4 +1,4 @@ -setName($exchangeName); - } elseif ($exchange instanceof AMQPChannel) { - $this->exchangeName = $exchangeName; - } else { + if ($exchange instanceof AMQPChannel) { + $this->exchangeName = (string) $exchangeName; + } elseif (!$exchange instanceof AMQPExchange) { throw new \InvalidArgumentException('PhpAmqpLib\Channel\AMQPChannel or AMQPExchange instance required'); + } elseif ($exchangeName) { + @trigger_error('The $exchangeName parameter can only be passed when using PhpAmqpLib, if using an AMQPExchange instance configure it beforehand', E_USER_DEPRECATED); } $this->exchange = $exchange; @@ -52,7 +53,7 @@ class AmqpHandler extends AbstractProcessingHandler /** * {@inheritDoc} */ - protected function write(array $record) + protected function write(array $record): void { $data = $record["formatted"]; $routingKey = $this->getRoutingKey($record); @@ -62,10 +63,10 @@ class AmqpHandler extends AbstractProcessingHandler $data, $routingKey, 0, - array( + [ 'delivery_mode' => 2, 'content_type' => 'application/json', - ) + ] ); } else { $this->exchange->basic_publish( @@ -79,7 +80,7 @@ class AmqpHandler extends AbstractProcessingHandler /** * {@inheritDoc} */ - public function handleBatch(array $records) + public function handleBatch(array $records): void { if ($this->exchange instanceof AMQPExchange) { parent::handleBatch($records); @@ -107,41 +108,29 @@ class AmqpHandler extends AbstractProcessingHandler /** * Gets the routing key for the AMQP exchange - * - * @param array $record - * @return string */ - protected function getRoutingKey(array $record) + protected function getRoutingKey(array $record): string { - $routingKey = sprintf( - '%s.%s', - // TODO 2.0 remove substr call - substr($record['level_name'], 0, 4), - $record['channel'] - ); + $routingKey = sprintf('%s.%s', $record['level_name'], $record['channel']); return strtolower($routingKey); } - /** - * @param string $data - * @return AMQPMessage - */ - private function createAmqpMessage($data) + private function createAmqpMessage(string $data): AMQPMessage { return new AMQPMessage( - (string) $data, - array( + $data, + [ 'delivery_mode' => 2, 'content_type' => 'application/json', - ) + ] ); } /** * {@inheritDoc} */ - protected function getDefaultFormatter() + protected function getDefaultFormatter(): FormatterInterface { return new JsonFormatter(JsonFormatter::BATCH_MODE_JSON, false); } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/BrowserConsoleHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/BrowserConsoleHandler.php index 23cf23b..4dff9f2 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/BrowserConsoleHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/BrowserConsoleHandler.php @@ -1,4 +1,4 @@ - */ -class BufferHandler extends AbstractHandler +class BufferHandler extends AbstractHandler implements ProcessableHandlerInterface { + use ProcessableHandlerTrait; + protected $handler; protected $bufferSize = 0; protected $bufferLimit; protected $flushOnOverflow; - protected $buffer = array(); + protected $buffer = []; protected $initialized = false; /** * @param HandlerInterface $handler Handler. * @param int $bufferLimit How many entries should be buffered at most, beyond that the oldest items are removed from the buffer. - * @param int $level The minimum logging level at which this handler will be triggered + * @param string|int $level The minimum logging level at which this handler will be triggered * @param bool $bubble Whether the messages that are handled can bubble up the stack or not * @param bool $flushOnOverflow If true, the buffer is flushed when the max size has been reached, by default oldest entries are discarded */ - public function __construct(HandlerInterface $handler, $bufferLimit = 0, $level = Logger::DEBUG, $bubble = true, $flushOnOverflow = false) + public function __construct(HandlerInterface $handler, int $bufferLimit = 0, $level = Logger::DEBUG, bool $bubble = true, bool $flushOnOverflow = false) { parent::__construct($level, $bubble); $this->handler = $handler; - $this->bufferLimit = (int) $bufferLimit; + $this->bufferLimit = $bufferLimit; $this->flushOnOverflow = $flushOnOverflow; } /** * {@inheritdoc} */ - public function handle(array $record) + public function handle(array $record): bool { if ($record['level'] < $this->level) { return false; @@ -57,7 +59,7 @@ class BufferHandler extends AbstractHandler if (!$this->initialized) { // __destructor() doesn't get called on Fatal errors - register_shutdown_function(array($this, 'close')); + register_shutdown_function([$this, 'close']); $this->initialized = true; } @@ -71,9 +73,7 @@ class BufferHandler extends AbstractHandler } if ($this->processors) { - foreach ($this->processors as $processor) { - $record = call_user_func($processor, $record); - } + $record = $this->processRecord($record); } $this->buffer[] = $record; @@ -82,7 +82,7 @@ class BufferHandler extends AbstractHandler return false === $this->bubble; } - public function flush() + public function flush(): void { if ($this->bufferSize === 0) { return; @@ -102,18 +102,20 @@ class BufferHandler extends AbstractHandler /** * {@inheritdoc} */ - public function close() + public function close(): void { $this->flush(); + + $this->handler->close(); } /** * Clears the buffer without flushing any messages down to the wrapped handler. */ - public function clear() + public function clear(): void { $this->bufferSize = 0; - $this->buffer = array(); + $this->buffer = []; } public function reset() @@ -122,6 +124,8 @@ class BufferHandler extends AbstractHandler parent::reset(); + $this->resetProcessors(); + if ($this->handler instanceof ResettableInterface) { $this->handler->reset(); } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/ChromePHPHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/ChromePHPHandler.php index 37419a0..8f35e19 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/ChromePHPHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/ChromePHPHandler.php @@ -1,4 +1,4 @@ - self::VERSION, - 'columns' => array('label', 'log', 'backtrace', 'type'), - 'rows' => array(), - ); + 'columns' => ['label', 'log', 'backtrace', 'type'], + 'rows' => [], + ]; protected static $sendHeaders = true; /** - * @param int $level The minimum logging level at which this handler will be triggered - * @param bool $bubble Whether the messages that are handled can bubble up the stack or not + * @param string|int $level The minimum logging level at which this handler will be triggered + * @param bool $bubble Whether the messages that are handled can bubble up the stack or not */ - public function __construct($level = Logger::DEBUG, $bubble = true) + public function __construct($level = Logger::DEBUG, bool $bubble = true) { parent::__construct($level, $bubble); if (!function_exists('json_encode')) { @@ -72,9 +75,13 @@ class ChromePHPHandler extends AbstractProcessingHandler /** * {@inheritdoc} */ - public function handleBatch(array $records) + public function handleBatch(array $records): void { - $messages = array(); + if (!$this->isWebRequest()) { + return; + } + + $messages = []; foreach ($records as $record) { if ($record['level'] < $this->level) { @@ -93,7 +100,7 @@ class ChromePHPHandler extends AbstractProcessingHandler /** * {@inheritDoc} */ - protected function getDefaultFormatter() + protected function getDefaultFormatter(): FormatterInterface { return new ChromePHPFormatter(); } @@ -103,10 +110,13 @@ class ChromePHPHandler extends AbstractProcessingHandler * * @see sendHeader() * @see send() - * @param array $record */ - protected function write(array $record) + protected function write(array $record): void { + if (!$this->isWebRequest()) { + return; + } + self::$json['rows'][] = $record['formatted']; $this->send(); @@ -117,7 +127,7 @@ class ChromePHPHandler extends AbstractProcessingHandler * * @see sendHeader() */ - protected function send() + protected function send(): void { if (self::$overflowed || !self::$sendHeaders) { return; @@ -131,7 +141,7 @@ class ChromePHPHandler extends AbstractProcessingHandler return; } - self::$json['request_uri'] = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : ''; + self::$json['request_uri'] = $_SERVER['REQUEST_URI'] ?? ''; } $json = @json_encode(self::$json); @@ -139,32 +149,29 @@ class ChromePHPHandler extends AbstractProcessingHandler if (strlen($data) > 240 * 1024) { self::$overflowed = true; - $record = array( + $record = [ 'message' => 'Incomplete logs, chrome header size limit reached', - 'context' => array(), + 'context' => [], 'level' => Logger::WARNING, 'level_name' => Logger::getLevelName(Logger::WARNING), 'channel' => 'monolog', - 'datetime' => new \DateTime(), - 'extra' => array(), - ); + 'datetime' => new \DateTimeImmutable(), + 'extra' => [], + ]; self::$json['rows'][count(self::$json['rows']) - 1] = $this->getFormatter()->format($record); $json = @json_encode(self::$json); $data = base64_encode(utf8_encode($json)); } if (trim($data) !== '') { - $this->sendHeader(self::HEADER_NAME, $data); + $this->sendHeader(static::HEADER_NAME, $data); } } /** * Send header string to the client - * - * @param string $header - * @param string $content */ - protected function sendHeader($header, $content) + protected function sendHeader(string $header, string $content): void { if (!headers_sent() && self::$sendHeaders) { header(sprintf('%s: %s', $header, $content)); @@ -173,39 +180,13 @@ class ChromePHPHandler extends AbstractProcessingHandler /** * Verifies if the headers are accepted by the current user agent - * - * @return bool */ - protected function headersAccepted() + protected function headersAccepted(): bool { if (empty($_SERVER['HTTP_USER_AGENT'])) { return false; } - return preg_match(self::USER_AGENT_REGEX, $_SERVER['HTTP_USER_AGENT']); - } - - /** - * BC getter for the sendHeaders property that has been made static - */ - public function __get($property) - { - if ('sendHeaders' !== $property) { - throw new \InvalidArgumentException('Undefined property '.$property); - } - - return static::$sendHeaders; - } - - /** - * BC setter for the sendHeaders property that has been made static - */ - public function __set($property, $value) - { - if ('sendHeaders' !== $property) { - throw new \InvalidArgumentException('Undefined property '.$property); - } - - static::$sendHeaders = $value; + return preg_match(static::USER_AGENT_REGEX, $_SERVER['HTTP_USER_AGENT']) === 1; } } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/CouchDBHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/CouchDBHandler.php index cc98697..b2d1e18 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/CouchDBHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/CouchDBHandler.php @@ -1,4 +1,4 @@ -options = array_merge(array( + $this->options = array_merge([ 'host' => 'localhost', 'port' => 5984, 'dbname' => 'logger', 'username' => null, 'password' => null, - ), $options); + ], $options); parent::__construct($level, $bubble); } @@ -39,7 +40,7 @@ class CouchDBHandler extends AbstractProcessingHandler /** * {@inheritDoc} */ - protected function write(array $record) + protected function write(array $record): void { $basicAuth = null; if ($this->options['username']) { @@ -47,17 +48,17 @@ class CouchDBHandler extends AbstractProcessingHandler } $url = 'http://'.$basicAuth.$this->options['host'].':'.$this->options['port'].'/'.$this->options['dbname']; - $context = stream_context_create(array( - 'http' => array( + $context = stream_context_create([ + 'http' => [ 'method' => 'POST', 'content' => $record['formatted'], 'ignore_errors' => true, 'max_redirects' => 0, 'header' => 'Content-type: application/json', - ), - )); + ], + ]); - if (false === @file_get_contents($url, null, $context)) { + if (false === @file_get_contents($url, false, $context)) { throw new \RuntimeException(sprintf('Could not connect to %s', $url)); } } @@ -65,7 +66,7 @@ class CouchDBHandler extends AbstractProcessingHandler /** * {@inheritDoc} */ - protected function getDefaultFormatter() + protected function getDefaultFormatter(): FormatterInterface { return new JsonFormatter(JsonFormatter::BATCH_MODE_JSON, false); } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/CubeHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/CubeHandler.php index 96b3ca0..298e572 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/CubeHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/CubeHandler.php @@ -1,4 +1,4 @@ -acceptedSchemes)) { throw new \UnexpectedValueException( 'Invalid protocol (' . $urlInfo['scheme'] . ').' - . ' Valid options are ' . implode(', ', $this->acceptedSchemes)); + . ' Valid options are ' . implode(', ', $this->acceptedSchemes) + ); } $this->scheme = $urlInfo['scheme']; @@ -62,7 +63,7 @@ class CubeHandler extends AbstractProcessingHandler * @throws \LogicException when unable to connect to the socket * @throws MissingExtensionException when there is no socket extension */ - protected function connectUdp() + protected function connectUdp(): void { if (!extension_loaded('sockets')) { throw new MissingExtensionException('The sockets extension is required to use udp URLs with the CubeHandler'); @@ -79,13 +80,15 @@ class CubeHandler extends AbstractProcessingHandler } /** - * Establish a connection to a http server - * @throws \LogicException when no curl extension + * Establish a connection to an http server + * + * @throws \LogicException when unable to connect to the socket + * @throws MissingExtensionException when no curl extension */ - protected function connectHttp() + protected function connectHttp(): void { if (!extension_loaded('curl')) { - throw new \LogicException('The curl extension is needed to use http URLs with the CubeHandler'); + throw new MissingExtensionException('The curl extension is required to use http URLs with the CubeHandler'); } $this->httpConnection = curl_init('http://'.$this->host.':'.$this->port.'/1.0/event/put'); @@ -101,11 +104,11 @@ class CubeHandler extends AbstractProcessingHandler /** * {@inheritdoc} */ - protected function write(array $record) + protected function write(array $record): void { $date = $record['datetime']; - $data = array('time' => $date->format('Y-m-d\TH:i:s.uO')); + $data = ['time' => $date->format('Y-m-d\TH:i:s.uO')]; unset($record['datetime']); if (isset($record['context']['type'])) { @@ -125,7 +128,7 @@ class CubeHandler extends AbstractProcessingHandler } } - private function writeUdp($data) + private function writeUdp(string $data): void { if (!$this->udpConnection) { $this->connectUdp(); @@ -134,17 +137,17 @@ class CubeHandler extends AbstractProcessingHandler socket_send($this->udpConnection, $data, strlen($data), 0); } - private function writeHttp($data) + private function writeHttp(string $data): void { if (!$this->httpConnection) { $this->connectHttp(); } curl_setopt($this->httpConnection, CURLOPT_POSTFIELDS, '['.$data.']'); - curl_setopt($this->httpConnection, CURLOPT_HTTPHEADER, array( + curl_setopt($this->httpConnection, CURLOPT_HTTPHEADER, [ 'Content-Type: application/json', 'Content-Length: ' . strlen('['.$data.']'), - )); + ]); Curl\Util::execute($this->httpConnection, 5, false); } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/Curl/Util.php b/vendor/monolog/monolog/src/Monolog/Handler/Curl/Util.php index 48d30b3..b0aeac9 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/Curl/Util.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/Curl/Util.php @@ -1,4 +1,4 @@ -time = $time; } - public function flush() + public function flush(): void { if ($this->bufferSize === 0) { return; @@ -81,7 +81,6 @@ class DeduplicationHandler extends BufferHandler foreach ($this->buffer as $record) { if ($record['level'] >= $this->deduplicationLevel) { - $passthru = $passthru || !$this->isDuplicate($record); if ($passthru) { $this->appendRecord($record); @@ -101,7 +100,7 @@ class DeduplicationHandler extends BufferHandler } } - private function isDuplicate(array $record) + private function isDuplicate(array $record): bool { if (!file_exists($this->deduplicationStore)) { return false; @@ -131,21 +130,26 @@ class DeduplicationHandler extends BufferHandler return false; } - private function collectLogs() + private function collectLogs(): void { if (!file_exists($this->deduplicationStore)) { - return false; + return; } $handle = fopen($this->deduplicationStore, 'rw+'); + + if (!$handle) { + throw new \RuntimeException('Failed to open file for reading and writing: ' . $this->deduplicationStore); + } + flock($handle, LOCK_EX); - $validLogs = array(); + $validLogs = []; $timestampValidity = time() - $this->time; while (!feof($handle)) { $log = fgets($handle); - if (substr($log, 0, 10) >= $timestampValidity) { + if ($log && substr($log, 0, 10) >= $timestampValidity) { $validLogs[] = $log; } } @@ -162,7 +166,7 @@ class DeduplicationHandler extends BufferHandler $this->gc = false; } - private function appendRecord(array $record) + private function appendRecord(array $record): void { file_put_contents($this->deduplicationStore, $record['datetime']->getTimestamp() . ':' . $record['level_name'] . ':' . preg_replace('{[\r\n].*}', '', $record['message']) . "\n", FILE_APPEND); } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/DoctrineCouchDBHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/DoctrineCouchDBHandler.php index b91ffec..b80490d 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/DoctrineCouchDBHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/DoctrineCouchDBHandler.php @@ -1,4 +1,4 @@ -client = $client; parent::__construct($level, $bubble); @@ -33,12 +34,12 @@ class DoctrineCouchDBHandler extends AbstractProcessingHandler /** * {@inheritDoc} */ - protected function write(array $record) + protected function write(array $record): void { $this->client->postDocument($record['formatted']); } - protected function getDefaultFormatter() + protected function getDefaultFormatter(): FormatterInterface { return new NormalizerFormatter; } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/DynamoDbHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/DynamoDbHandler.php index 237b71f..21d7431 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/DynamoDbHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/DynamoDbHandler.php @@ -1,4 +1,4 @@ -=')) { $this->version = 3; @@ -71,7 +69,7 @@ class DynamoDbHandler extends AbstractProcessingHandler /** * {@inheritdoc} */ - protected function write(array $record) + protected function write(array $record): void { $filtered = $this->filterEmptyFields($record['formatted']); if ($this->version === 3) { @@ -80,17 +78,13 @@ class DynamoDbHandler extends AbstractProcessingHandler $formatted = $this->client->formatAttributes($filtered); } - $this->client->putItem(array( + $this->client->putItem([ 'TableName' => $this->table, 'Item' => $formatted, - )); + ]); } - /** - * @param array $record - * @return array - */ - protected function filterEmptyFields(array $record) + protected function filterEmptyFields(array $record): array { return array_filter($record, function ($value) { return !empty($value) || false === $value || 0 === $value; @@ -100,7 +94,7 @@ class DynamoDbHandler extends AbstractProcessingHandler /** * {@inheritdoc} */ - protected function getDefaultFormatter() + protected function getDefaultFormatter(): FormatterInterface { return new ScalarFormatter(self::DATE_FORMAT); } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/ElasticSearchHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/ElasticaHandler.php similarity index 67% rename from vendor/monolog/monolog/src/Monolog/Handler/ElasticSearchHandler.php rename to vendor/monolog/monolog/src/Monolog/Handler/ElasticaHandler.php index bb0f83e..78a8d1e 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/ElasticSearchHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/ElasticaHandler.php @@ -1,4 +1,4 @@ - 'elastic_index_name', * 'type' => 'elastic_doc_type', * ); - * $handler = new ElasticSearchHandler($client, $options); + * $handler = new ElasticaHandler($client, $options); * $log = new Logger('application'); * $log->pushHandler($handler); * * @author Jelle Vink */ -class ElasticSearchHandler extends AbstractProcessingHandler +class ElasticaHandler extends AbstractProcessingHandler { /** * @var Client @@ -43,24 +43,24 @@ class ElasticSearchHandler extends AbstractProcessingHandler /** * @var array Handler config options */ - protected $options = array(); + protected $options = []; /** - * @param Client $client Elastica Client object - * @param array $options Handler configuration - * @param int $level The minimum logging level at which this handler will be triggered - * @param bool $bubble Whether the messages that are handled can bubble up the stack or not + * @param Client $client Elastica Client object + * @param array $options Handler configuration + * @param int|string $level The minimum logging level at which this handler will be triggered + * @param bool $bubble Whether the messages that are handled can bubble up the stack or not */ - public function __construct(Client $client, array $options = array(), $level = Logger::DEBUG, $bubble = true) + public function __construct(Client $client, array $options = [], $level = Logger::DEBUG, bool $bubble = true) { parent::__construct($level, $bubble); $this->client = $client; $this->options = array_merge( - array( + [ 'index' => 'monolog', // Elastic index name 'type' => 'record', // Elastic document type 'ignore_error' => false, // Suppress Elastica exceptions - ), + ], $options ); } @@ -68,27 +68,24 @@ class ElasticSearchHandler extends AbstractProcessingHandler /** * {@inheritDoc} */ - protected function write(array $record) + protected function write(array $record): void { - $this->bulkSend(array($record['formatted'])); + $this->bulkSend([$record['formatted']]); } /** * {@inheritdoc} */ - public function setFormatter(FormatterInterface $formatter) + public function setFormatter(FormatterInterface $formatter): HandlerInterface { if ($formatter instanceof ElasticaFormatter) { return parent::setFormatter($formatter); } - throw new \InvalidArgumentException('ElasticSearchHandler is only compatible with ElasticaFormatter'); + + throw new \InvalidArgumentException('ElasticaHandler is only compatible with ElasticaFormatter'); } - /** - * Getter options - * @return array - */ - public function getOptions() + public function getOptions(): array { return $this->options; } @@ -96,7 +93,7 @@ class ElasticSearchHandler extends AbstractProcessingHandler /** * {@inheritDoc} */ - protected function getDefaultFormatter() + protected function getDefaultFormatter(): FormatterInterface { return new ElasticaFormatter($this->options['index'], $this->options['type']); } @@ -104,7 +101,7 @@ class ElasticSearchHandler extends AbstractProcessingHandler /** * {@inheritdoc} */ - public function handleBatch(array $records) + public function handleBatch(array $records): void { $documents = $this->getFormatter()->formatBatch($records); $this->bulkSend($documents); @@ -112,10 +109,9 @@ class ElasticSearchHandler extends AbstractProcessingHandler /** * Use Elasticsearch bulk API to send list of documents - * @param array $documents * @throws \RuntimeException */ - protected function bulkSend(array $documents) + protected function bulkSend(array $documents): void { try { $this->client->addDocuments($documents); diff --git a/vendor/monolog/monolog/src/Monolog/Handler/ElasticsearchHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/ElasticsearchHandler.php new file mode 100644 index 0000000..6d0021b --- /dev/null +++ b/vendor/monolog/monolog/src/Monolog/Handler/ElasticsearchHandler.php @@ -0,0 +1,159 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Monolog\Handler; + +use Elasticsearch\Client; +use Elasticsearch\Common\Exceptions\RuntimeException as ElasticsearchRuntimeException; +use InvalidArgumentException; +use Monolog\Formatter\ElasticsearchFormatter; +use Monolog\Formatter\FormatterInterface; +use Monolog\Logger; +use RuntimeException; +use Throwable; + +/** + * Elasticsearch handler + * + * @link https://www.elastic.co/guide/en/elasticsearch/client/php-api/current/index.html + * + * Simple usage example: + * + * $client = \Elasticsearch\ClientBuilder::create() + * ->setHosts($hosts) + * ->build(); + * + * $options = array( + * 'index' => 'elastic_index_name', + * 'type' => 'elastic_doc_type', + * ); + * $handler = new ElasticsearchHandler($client, $options); + * $log = new Logger('application'); + * $log->pushHandler($handler); + * + * @author Avtandil Kikabidze + */ +class ElasticsearchHandler extends AbstractProcessingHandler +{ + /** + * @var Client + */ + protected $client; + + /** + * @var array Handler config options + */ + protected $options = []; + + /** + * @param Client $client Elasticsearch Client object + * @param array $options Handler configuration + * @param string|int $level The minimum logging level at which this handler will be triggered + * @param bool $bubble Whether the messages that are handled can bubble up the stack or not + */ + public function __construct(Client $client, array $options = [], $level = Logger::DEBUG, bool $bubble = true) + { + parent::__construct($level, $bubble); + $this->client = $client; + $this->options = array_merge( + [ + 'index' => 'monolog', // Elastic index name + 'type' => '_doc', // Elastic document type + 'ignore_error' => false, // Suppress Elasticsearch exceptions + ], + $options + ); + } + + /** + * {@inheritDoc} + */ + protected function write(array $record): void + { + $this->bulkSend([$record['formatted']]); + } + + /** + * {@inheritdoc} + */ + public function setFormatter(FormatterInterface $formatter): HandlerInterface + { + if ($formatter instanceof ElasticsearchFormatter) { + return parent::setFormatter($formatter); + } + + throw new InvalidArgumentException('ElasticsearchHandler is only compatible with ElasticsearchFormatter'); + } + + /** + * Getter options + * + * @return array + */ + public function getOptions(): array + { + return $this->options; + } + + /** + * {@inheritDoc} + */ + protected function getDefaultFormatter(): FormatterInterface + { + return new ElasticsearchFormatter($this->options['index'], $this->options['type']); + } + + /** + * {@inheritdoc} + */ + public function handleBatch(array $records): void + { + $documents = $this->getFormatter()->formatBatch($records); + $this->bulkSend($documents); + } + + /** + * Use Elasticsearch bulk API to send list of documents + * + * @param array $records + * @throws \RuntimeException + */ + protected function bulkSend(array $records): void + { + try { + $params = [ + 'body' => [], + ]; + + foreach ($records as $record) { + $params['body'][] = [ + 'index' => [ + '_index' => $record['_index'], + '_type' => $record['_type'], + ], + ]; + unset($record['_index'], $record['_type']); + + $params['body'][] = $record; + } + + $responses = $this->client->bulk($params); + + if ($responses['errors'] === true) { + throw new ElasticsearchRuntimeException('Elasticsearch returned error for one of the records'); + } + } catch (Throwable $e) { + if (! $this->options['ignore_error']) { + throw new RuntimeException('Error sending messages to Elasticsearch', 0, $e); + } + } + } +} diff --git a/vendor/monolog/monolog/src/Monolog/Handler/ErrorLogHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/ErrorLogHandler.php index b2986b0..737c070 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/ErrorLogHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/ErrorLogHandler.php @@ -1,4 +1,4 @@ -expandNewlines) { - $lines = preg_split('{[\r\n]+}', (string) $record['formatted']); - foreach ($lines as $line) { - error_log($line, $this->messageType); - } - } else { + if (!$this->expandNewlines) { error_log((string) $record['formatted'], $this->messageType); + + return; + } + + $lines = preg_split('{[\r\n]+}', (string) $record['formatted']); + foreach ($lines as $line) { + error_log($line, $this->messageType); } } } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/FallbackGroupHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/FallbackGroupHandler.php new file mode 100644 index 0000000..ea06574 --- /dev/null +++ b/vendor/monolog/monolog/src/Monolog/Handler/FallbackGroupHandler.php @@ -0,0 +1,59 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Monolog\Handler; + +use Throwable; + +class FallbackGroupHandler extends GroupHandler +{ + /** + * {@inheritdoc} + */ + public function handle(array $record): bool + { + if ($this->processors) { + $record = $this->processRecord($record); + } + foreach ($this->handlers as $handler) { + try { + $handler->handle($record); + break; + } catch (Throwable $e) { + // What throwable? + } + } + return false === $this->bubble; + } + + /** + * {@inheritdoc} + */ + public function handleBatch(array $records): void + { + if ($this->processors) { + $processed = []; + foreach ($records as $record) { + $processed[] = $this->processRecord($record); + } + $records = $processed; + } + + foreach ($this->handlers as $handler) { + try { + $handler->handleBatch($records); + break; + } catch (Throwable $e) { + // What throwable? + } + } + } +} diff --git a/vendor/monolog/monolog/src/Monolog/Handler/FilterHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/FilterHandler.php index 938c1a7..e62d43f 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/FilterHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/FilterHandler.php @@ -1,4 +1,4 @@ - */ -class FilterHandler extends AbstractHandler +class FilterHandler extends Handler implements ProcessableHandlerInterface, ResettableInterface { + use ProcessableHandlerTrait; + /** * Handler or factory callable($record, $this) * @@ -47,10 +50,10 @@ class FilterHandler extends AbstractHandler /** * @param callable|HandlerInterface $handler Handler or factory callable($record, $this). * @param int|array $minLevelOrList A list of levels to accept or a minimum level if maxLevel is provided - * @param int $maxLevel Maximum level to accept, only used if $minLevelOrList is not an array + * @param int|string $maxLevel Maximum level to accept, only used if $minLevelOrList is not an array * @param bool $bubble Whether the messages that are handled can bubble up the stack or not */ - public function __construct($handler, $minLevelOrList = Logger::DEBUG, $maxLevel = Logger::EMERGENCY, $bubble = true) + public function __construct($handler, $minLevelOrList = Logger::DEBUG, $maxLevel = Logger::EMERGENCY, bool $bubble = true) { $this->handler = $handler; $this->bubble = $bubble; @@ -61,10 +64,7 @@ class FilterHandler extends AbstractHandler } } - /** - * @return array - */ - public function getAcceptedLevels() + public function getAcceptedLevels(): array { return array_flip($this->acceptedLevels); } @@ -73,7 +73,7 @@ class FilterHandler extends AbstractHandler * @param int|string|array $minLevelOrList A list of levels to accept or a minimum level or level name if maxLevel is provided * @param int|string $maxLevel Maximum level or level name to accept, only used if $minLevelOrList is not an array */ - public function setAcceptedLevels($minLevelOrList = Logger::DEBUG, $maxLevel = Logger::EMERGENCY) + public function setAcceptedLevels($minLevelOrList = Logger::DEBUG, $maxLevel = Logger::EMERGENCY): self { if (is_array($minLevelOrList)) { $acceptedLevels = array_map('Monolog\Logger::toMonologLevel', $minLevelOrList); @@ -85,12 +85,14 @@ class FilterHandler extends AbstractHandler })); } $this->acceptedLevels = array_flip($acceptedLevels); + + return $this; } /** * {@inheritdoc} */ - public function isHandling(array $record) + public function isHandling(array $record): bool { return isset($this->acceptedLevels[$record['level']]); } @@ -98,7 +100,7 @@ class FilterHandler extends AbstractHandler /** * {@inheritdoc} */ - public function handle(array $record) + public function handle(array $record): bool { if (!$this->isHandling($record)) { return false; @@ -113,9 +115,7 @@ class FilterHandler extends AbstractHandler } if ($this->processors) { - foreach ($this->processors as $processor) { - $record = call_user_func($processor, $record); - } + $record = $this->processRecord($record); } $this->handler->handle($record); @@ -126,9 +126,9 @@ class FilterHandler extends AbstractHandler /** * {@inheritdoc} */ - public function handleBatch(array $records) + public function handleBatch(array $records): void { - $filtered = array(); + $filtered = []; foreach ($records as $record) { if ($this->isHandling($record)) { $filtered[] = $record; @@ -137,4 +137,9 @@ class FilterHandler extends AbstractHandler $this->handler->handleBatch($filtered); } + + public function reset() + { + $this->resetProcessors(); + } } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ActivationStrategyInterface.php b/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ActivationStrategyInterface.php index aaca12c..1ba99c7 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ActivationStrategyInterface.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ActivationStrategyInterface.php @@ -1,4 +1,4 @@ -defaultActionLevel = Logger::toMonologLevel($defaultActionLevel); $this->channelToActionLevel = array_map('Monolog\Logger::toMonologLevel', $channelToActionLevel); } - public function isHandlerActivated(array $record) + public function isHandlerActivated(array $record): bool { if (isset($this->channelToActionLevel[$record['channel']])) { return $record['level'] >= $this->channelToActionLevel[$record['channel']]; diff --git a/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ErrorLevelActivationStrategy.php b/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ErrorLevelActivationStrategy.php index 6e63085..71601e4 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ErrorLevelActivationStrategy.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ErrorLevelActivationStrategy.php @@ -1,4 +1,4 @@ -actionLevel = Logger::toMonologLevel($actionLevel); } - public function isHandlerActivated(array $record) + public function isHandlerActivated(array $record): bool { return $record['level'] >= $this->actionLevel; } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossedHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossedHandler.php index 275fd51..11f3b50 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossedHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossedHandler.php @@ -1,4 +1,4 @@ - */ -class FingersCrossedHandler extends AbstractHandler +class FingersCrossedHandler extends Handler implements ProcessableHandlerInterface, ResettableInterface { + use ProcessableHandlerTrait; + protected $handler; protected $activationStrategy; protected $buffering = true; protected $bufferSize; - protected $buffer = array(); + protected $buffer = []; protected $stopBuffering; protected $passthruLevel; + protected $bubble; /** - * @param callable|HandlerInterface $handler Handler or factory callable($record, $fingersCrossedHandler). - * @param int|ActivationStrategyInterface $activationStrategy Strategy which determines when this handler takes action - * @param int $bufferSize How many entries should be buffered at most, beyond that the oldest items are removed from the buffer. - * @param bool $bubble Whether the messages that are handled can bubble up the stack or not - * @param bool $stopBuffering Whether the handler should stop buffering after being triggered (default true) - * @param int $passthruLevel Minimum level to always flush to handler on close, even if strategy not triggered + * @param callable|HandlerInterface $handler Handler or factory callable($record, $fingersCrossedHandler). + * @param int|string|ActivationStrategyInterface $activationStrategy Strategy which determines when this handler takes action, or a level name/value at which the handler is activated + * @param int $bufferSize How many entries should be buffered at most, beyond that the oldest items are removed from the buffer. + * @param bool $bubble Whether the messages that are handled can bubble up the stack or not + * @param bool $stopBuffering Whether the handler should stop buffering after being triggered (default true) + * @param int|string $passthruLevel Minimum level to always flush to handler on close, even if strategy not triggered */ - public function __construct($handler, $activationStrategy = null, $bufferSize = 0, $bubble = true, $stopBuffering = true, $passthruLevel = null) + public function __construct($handler, $activationStrategy = null, int $bufferSize = 0, bool $bubble = true, bool $stopBuffering = true, $passthruLevel = null) { if (null === $activationStrategy) { $activationStrategy = new ErrorLevelActivationStrategy(Logger::WARNING); @@ -75,7 +82,7 @@ class FingersCrossedHandler extends AbstractHandler /** * {@inheritdoc} */ - public function isHandling(array $record) + public function isHandling(array $record): bool { return true; } @@ -83,7 +90,7 @@ class FingersCrossedHandler extends AbstractHandler /** * Manually activate this logger regardless of the activation strategy */ - public function activate() + public function activate(): void { if ($this->stopBuffering) { $this->buffering = false; @@ -97,18 +104,16 @@ class FingersCrossedHandler extends AbstractHandler } } $this->handler->handleBatch($this->buffer); - $this->buffer = array(); + $this->buffer = []; } /** * {@inheritdoc} */ - public function handle(array $record) + public function handle(array $record): bool { if ($this->processors) { - foreach ($this->processors as $processor) { - $record = call_user_func($processor, $record); - } + $record = $this->processRecord($record); } if ($this->buffering) { @@ -129,16 +134,18 @@ class FingersCrossedHandler extends AbstractHandler /** * {@inheritdoc} */ - public function close() + public function close(): void { $this->flushBuffer(); + + $this->handler->close(); } public function reset() { $this->flushBuffer(); - parent::reset(); + $this->resetProcessors(); if ($this->handler instanceof ResettableInterface) { $this->handler->reset(); @@ -150,16 +157,16 @@ class FingersCrossedHandler extends AbstractHandler * * It also resets the handler to its initial buffering state. */ - public function clear() + public function clear(): void { - $this->buffer = array(); + $this->buffer = []; $this->reset(); } /** * Resets the state of the handler. Stops forwarding records to the wrapped handler. */ - private function flushBuffer() + private function flushBuffer(): void { if (null !== $this->passthruLevel) { $level = $this->passthruLevel; @@ -171,7 +178,7 @@ class FingersCrossedHandler extends AbstractHandler } } - $this->buffer = array(); + $this->buffer = []; $this->buffering = true; } } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/FirePHPHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/FirePHPHandler.php index c30b184..c963863 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/FirePHPHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/FirePHPHandler.php @@ -1,4 +1,4 @@ - $message); + return [$header => $message]; } /** * Creates message header from record * * @see createHeader() - * @param array $record - * @return string */ - protected function createRecordHeader(array $record) + protected function createRecordHeader(array $record): array { // Wildfire is extensible to support multiple protocols & plugins in a single request, // but we're not taking advantage of that (yet), so we're using "1" for simplicity's sake. return $this->createHeader( - array(1, 1, 1, self::$messageIndex++), + [1, 1, 1, self::$messageIndex++], $record['formatted'] ); } @@ -87,7 +88,7 @@ class FirePHPHandler extends AbstractProcessingHandler /** * {@inheritDoc} */ - protected function getDefaultFormatter() + protected function getDefaultFormatter(): FormatterInterface { return new WildfireFormatter(); } @@ -97,25 +98,21 @@ class FirePHPHandler extends AbstractProcessingHandler * * @see createHeader() * @see sendHeader() - * @return array */ - protected function getInitHeaders() + protected function getInitHeaders(): array { // Initial payload consists of required headers for Wildfire return array_merge( - $this->createHeader(array('Protocol', 1), self::PROTOCOL_URI), - $this->createHeader(array(1, 'Structure', 1), self::STRUCTURE_URI), - $this->createHeader(array(1, 'Plugin', 1), self::PLUGIN_URI) + $this->createHeader(['Protocol', 1], static::PROTOCOL_URI), + $this->createHeader([1, 'Structure', 1], static::STRUCTURE_URI), + $this->createHeader([1, 'Plugin', 1], static::PLUGIN_URI) ); } /** * Send header string to the client - * - * @param string $header - * @param string $content */ - protected function sendHeader($header, $content) + protected function sendHeader(string $header, string $content): void { if (!headers_sent() && self::$sendHeaders) { header(sprintf('%s: %s', $header, $content)); @@ -129,9 +126,9 @@ class FirePHPHandler extends AbstractProcessingHandler * @see sendInitHeaders() * @param array $record */ - protected function write(array $record) + protected function write(array $record): void { - if (!self::$sendHeaders) { + if (!self::$sendHeaders || !$this->isWebRequest()) { return; } @@ -157,10 +154,8 @@ class FirePHPHandler extends AbstractProcessingHandler /** * Verifies if the headers are accepted by the current user agent - * - * @return bool */ - protected function headersAccepted() + protected function headersAccepted(): bool { if (!empty($_SERVER['HTTP_USER_AGENT']) && preg_match('{\bFirePHP/\d+\.\d+\b}', $_SERVER['HTTP_USER_AGENT'])) { return true; @@ -168,28 +163,4 @@ class FirePHPHandler extends AbstractProcessingHandler return isset($_SERVER['HTTP_X_FIREPHP_VERSION']); } - - /** - * BC getter for the sendHeaders property that has been made static - */ - public function __get($property) - { - if ('sendHeaders' !== $property) { - throw new \InvalidArgumentException('Undefined property '.$property); - } - - return static::$sendHeaders; - } - - /** - * BC setter for the sendHeaders property that has been made static - */ - public function __set($property, $value) - { - if ('sendHeaders' !== $property) { - throw new \InvalidArgumentException('Undefined property '.$property); - } - - static::$sendHeaders = $value; - } } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/FleepHookHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/FleepHookHandler.php index c43c013..5087009 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/FleepHookHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/FleepHookHandler.php @@ -1,4 +1,4 @@ -token = $token; - $connectionString = 'ssl://' . self::FLEEP_HOST . ':443'; + $connectionString = 'ssl://' . static::FLEEP_HOST . ':443'; parent::__construct($connectionString, $level, $bubble); } @@ -63,17 +64,15 @@ class FleepHookHandler extends SocketHandler * * @return LineFormatter */ - protected function getDefaultFormatter() + protected function getDefaultFormatter(): FormatterInterface { return new LineFormatter(null, null, true, true); } /** * Handles a log record - * - * @param array $record */ - public function write(array $record) + public function write(array $record): void { parent::write($record); $this->closeSocket(); @@ -81,11 +80,8 @@ class FleepHookHandler extends SocketHandler /** * {@inheritdoc} - * - * @param array $record - * @return string */ - protected function generateDataStream($record) + protected function generateDataStream(array $record): string { $content = $this->buildContent($record); @@ -94,14 +90,11 @@ class FleepHookHandler extends SocketHandler /** * Builds the header of the API Call - * - * @param string $content - * @return string */ - private function buildHeader($content) + private function buildHeader(string $content): string { - $header = "POST " . self::FLEEP_HOOK_URI . $this->token . " HTTP/1.1\r\n"; - $header .= "Host: " . self::FLEEP_HOST . "\r\n"; + $header = "POST " . static::FLEEP_HOOK_URI . $this->token . " HTTP/1.1\r\n"; + $header .= "Host: " . static::FLEEP_HOST . "\r\n"; $header .= "Content-Type: application/x-www-form-urlencoded\r\n"; $header .= "Content-Length: " . strlen($content) . "\r\n"; $header .= "\r\n"; @@ -111,15 +104,12 @@ class FleepHookHandler extends SocketHandler /** * Builds the body of API call - * - * @param array $record - * @return string */ - private function buildContent($record) + private function buildContent(array $record): string { - $dataArray = array( + $dataArray = [ 'message' => $record['formatted'], - ); + ]; return http_build_query($dataArray); } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/FlowdockHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/FlowdockHandler.php index dd9a361..be46d03 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/FlowdockHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/FlowdockHandler.php @@ -1,4 +1,4 @@ -buildContent($record); @@ -99,22 +93,16 @@ class FlowdockHandler extends SocketHandler /** * Builds the body of API call - * - * @param array $record - * @return string */ - private function buildContent($record) + private function buildContent(array $record): string { return json_encode($record['formatted']['flowdock']); } /** * Builds the header of the API Call - * - * @param string $content - * @return string */ - private function buildHeader($content) + private function buildHeader(string $content): string { $header = "POST /v1/messages/team_inbox/" . $this->apiToken . " HTTP/1.1\r\n"; $header .= "Host: api.flowdock.com\r\n"; diff --git a/vendor/monolog/monolog/src/Monolog/Handler/FormattableHandlerInterface.php b/vendor/monolog/monolog/src/Monolog/Handler/FormattableHandlerInterface.php new file mode 100644 index 0000000..fc1693c --- /dev/null +++ b/vendor/monolog/monolog/src/Monolog/Handler/FormattableHandlerInterface.php @@ -0,0 +1,37 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Monolog\Handler; + +use Monolog\Formatter\FormatterInterface; + +/** + * Interface to describe loggers that have a formatter + * + * @author Jordi Boggiano + */ +interface FormattableHandlerInterface +{ + /** + * Sets the formatter. + * + * @param FormatterInterface $formatter + * @return HandlerInterface self + */ + public function setFormatter(FormatterInterface $formatter): HandlerInterface; + + /** + * Gets the formatter. + * + * @return FormatterInterface + */ + public function getFormatter(): FormatterInterface; +} diff --git a/vendor/monolog/monolog/src/Monolog/Handler/FormattableHandlerTrait.php b/vendor/monolog/monolog/src/Monolog/Handler/FormattableHandlerTrait.php new file mode 100644 index 0000000..00140b4 --- /dev/null +++ b/vendor/monolog/monolog/src/Monolog/Handler/FormattableHandlerTrait.php @@ -0,0 +1,61 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Monolog\Handler; + +use Monolog\Formatter\FormatterInterface; +use Monolog\Formatter\LineFormatter; + +/** + * Helper trait for implementing FormattableInterface + * + * @author Jordi Boggiano + */ +trait FormattableHandlerTrait +{ + /** + * @var FormatterInterface + */ + protected $formatter; + + /** + * {@inheritdoc} + * @suppress PhanTypeMismatchReturn + */ + public function setFormatter(FormatterInterface $formatter): HandlerInterface + { + $this->formatter = $formatter; + + return $this; + } + + /** + * {@inheritdoc} + */ + public function getFormatter(): FormatterInterface + { + if (!$this->formatter) { + $this->formatter = $this->getDefaultFormatter(); + } + + return $this->formatter; + } + + /** + * Gets the default formatter. + * + * Overwrite this if the LineFormatter is not a good default for your handler. + */ + protected function getDefaultFormatter(): FormatterInterface + { + return new LineFormatter(); + } +} diff --git a/vendor/monolog/monolog/src/Monolog/Handler/GelfHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/GelfHandler.php index 71e4669..d6965fa 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/GelfHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/GelfHandler.php @@ -1,4 +1,4 @@ -publisher = $publisher; } /** * {@inheritdoc} */ - protected function write(array $record) + protected function write(array $record): void { $this->publisher->publish($record['formatted']); } @@ -58,7 +52,7 @@ class GelfHandler extends AbstractProcessingHandler /** * {@inheritDoc} */ - protected function getDefaultFormatter() + protected function getDefaultFormatter(): FormatterInterface { return new GelfMessageFormatter(); } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/GroupHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/GroupHandler.php index 28e5c56..5121856 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/GroupHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/GroupHandler.php @@ -1,4 +1,4 @@ - */ -class GroupHandler extends AbstractHandler +class GroupHandler extends Handler implements ProcessableHandlerInterface, ResettableInterface { + use ProcessableHandlerTrait; + protected $handlers; + protected $bubble; /** - * @param array $handlers Array of Handlers. - * @param bool $bubble Whether the messages that are handled can bubble up the stack or not + * @param HandlerInterface[] $handlers Array of Handlers. + * @param bool $bubble Whether the messages that are handled can bubble up the stack or not */ - public function __construct(array $handlers, $bubble = true) + public function __construct(array $handlers, bool $bubble = true) { foreach ($handlers as $handler) { if (!$handler instanceof HandlerInterface) { @@ -42,7 +45,7 @@ class GroupHandler extends AbstractHandler /** * {@inheritdoc} */ - public function isHandling(array $record) + public function isHandling(array $record): bool { foreach ($this->handlers as $handler) { if ($handler->isHandling($record)) { @@ -56,12 +59,10 @@ class GroupHandler extends AbstractHandler /** * {@inheritdoc} */ - public function handle(array $record) + public function handle(array $record): bool { if ($this->processors) { - foreach ($this->processors as $processor) { - $record = call_user_func($processor, $record); - } + $record = $this->processRecord($record); } foreach ($this->handlers as $handler) { @@ -74,14 +75,12 @@ class GroupHandler extends AbstractHandler /** * {@inheritdoc} */ - public function handleBatch(array $records) + public function handleBatch(array $records): void { if ($this->processors) { - $processed = array(); + $processed = []; foreach ($records as $record) { - foreach ($this->processors as $processor) { - $processed[] = call_user_func($processor, $record); - } + $processed[] = $this->processRecord($record); } $records = $processed; } @@ -93,7 +92,7 @@ class GroupHandler extends AbstractHandler public function reset() { - parent::reset(); + $this->resetProcessors(); foreach ($this->handlers as $handler) { if ($handler instanceof ResettableInterface) { @@ -102,10 +101,19 @@ class GroupHandler extends AbstractHandler } } + public function close(): void + { + parent::close(); + + foreach ($this->handlers as $handler) { + $handler->close(); + } + } + /** * {@inheritdoc} */ - public function setFormatter(FormatterInterface $formatter) + public function setFormatter(FormatterInterface $formatter): HandlerInterface { foreach ($this->handlers as $handler) { $handler->setFormatter($formatter); diff --git a/vendor/monolog/monolog/src/Monolog/Handler/Handler.php b/vendor/monolog/monolog/src/Monolog/Handler/Handler.php new file mode 100644 index 0000000..9f43fe1 --- /dev/null +++ b/vendor/monolog/monolog/src/Monolog/Handler/Handler.php @@ -0,0 +1,53 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Monolog\Handler; + +/** + * Base Handler class providing basic close() support as well as handleBatch + * + * @author Jordi Boggiano + */ +abstract class Handler implements HandlerInterface +{ + /** + * {@inheritdoc} + */ + public function handleBatch(array $records): void + { + foreach ($records as $record) { + $this->handle($record); + } + } + + /** + * {@inheritdoc} + */ + public function close(): void + { + } + + public function __destruct() + { + try { + $this->close(); + } catch (\Throwable $e) { + // do nothing + } + } + + public function __sleep() + { + $this->close(); + + return array_keys(get_object_vars($this)); + } +} diff --git a/vendor/monolog/monolog/src/Monolog/Handler/HandlerInterface.php b/vendor/monolog/monolog/src/Monolog/Handler/HandlerInterface.php index 8d5a4a0..68aed18 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/HandlerInterface.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/HandlerInterface.php @@ -1,4 +1,4 @@ - */ -class HandlerWrapper implements HandlerInterface, ResettableInterface +class HandlerWrapper implements HandlerInterface, ProcessableHandlerInterface, FormattableHandlerInterface, ResettableInterface { /** * @var HandlerInterface */ protected $handler; - /** - * HandlerWrapper constructor. - * @param HandlerInterface $handler - */ public function __construct(HandlerInterface $handler) { $this->handler = $handler; @@ -50,7 +46,7 @@ class HandlerWrapper implements HandlerInterface, ResettableInterface /** * {@inheritdoc} */ - public function isHandling(array $record) + public function isHandling(array $record): bool { return $this->handler->isHandling($record); } @@ -58,7 +54,7 @@ class HandlerWrapper implements HandlerInterface, ResettableInterface /** * {@inheritdoc} */ - public function handle(array $record) + public function handle(array $record): bool { return $this->handler->handle($record); } @@ -66,45 +62,67 @@ class HandlerWrapper implements HandlerInterface, ResettableInterface /** * {@inheritdoc} */ - public function handleBatch(array $records) + public function handleBatch(array $records): void { - return $this->handler->handleBatch($records); + $this->handler->handleBatch($records); } /** * {@inheritdoc} */ - public function pushProcessor($callback) + public function close(): void { - $this->handler->pushProcessor($callback); - - return $this; + $this->handler->close(); } /** * {@inheritdoc} */ - public function popProcessor() + public function pushProcessor(callable $callback): HandlerInterface { - return $this->handler->popProcessor(); + if ($this->handler instanceof ProcessableHandlerInterface) { + $this->handler->pushProcessor($callback); + + return $this; + } + + throw new \LogicException('The wrapped handler does not implement ' . ProcessableHandlerInterface::class); } /** * {@inheritdoc} */ - public function setFormatter(FormatterInterface $formatter) + public function popProcessor(): callable { - $this->handler->setFormatter($formatter); + if ($this->handler instanceof ProcessableHandlerInterface) { + return $this->handler->popProcessor(); + } - return $this; + throw new \LogicException('The wrapped handler does not implement ' . ProcessableHandlerInterface::class); } /** * {@inheritdoc} */ - public function getFormatter() + public function setFormatter(FormatterInterface $formatter): HandlerInterface { - return $this->handler->getFormatter(); + if ($this->handler instanceof FormattableHandlerInterface) { + $this->handler->setFormatter($formatter); + } + + throw new \LogicException('The wrapped handler does not implement ' . FormattableHandlerInterface::class); + } + + /** + * {@inheritdoc} + */ + public function getFormatter(): FormatterInterface + { + if ($this->handler instanceof FormattableHandlerInterface) { + return $this->handler->getFormatter(); + } + + throw new \LogicException('The wrapped handler does not implement ' . FormattableHandlerInterface::class); } public function reset() diff --git a/vendor/monolog/monolog/src/Monolog/Handler/HipChatHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/HipChatHandler.php deleted file mode 100644 index 73233c9..0000000 --- a/vendor/monolog/monolog/src/Monolog/Handler/HipChatHandler.php +++ /dev/null @@ -1,365 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\Logger; - -/** - * Sends notifications through the hipchat api to a hipchat room - * - * Notes: - * API token - HipChat API token - * Room - HipChat Room Id or name, where messages are sent - * Name - Name used to send the message (from) - * notify - Should the message trigger a notification in the clients - * version - The API version to use (HipChatHandler::API_V1 | HipChatHandler::API_V2) - * - * @author Rafael Dohms - * @see https://www.hipchat.com/docs/api - */ -class HipChatHandler extends SocketHandler -{ - /** - * Use API version 1 - */ - const API_V1 = 'v1'; - - /** - * Use API version v2 - */ - const API_V2 = 'v2'; - - /** - * The maximum allowed length for the name used in the "from" field. - */ - const MAXIMUM_NAME_LENGTH = 15; - - /** - * The maximum allowed length for the message. - */ - const MAXIMUM_MESSAGE_LENGTH = 9500; - - /** - * @var string - */ - private $token; - - /** - * @var string - */ - private $room; - - /** - * @var string - */ - private $name; - - /** - * @var bool - */ - private $notify; - - /** - * @var string - */ - private $format; - - /** - * @var string - */ - private $host; - - /** - * @var string - */ - private $version; - - /** - * @param string $token HipChat API Token - * @param string $room The room that should be alerted of the message (Id or Name) - * @param string $name Name used in the "from" field. - * @param bool $notify Trigger a notification in clients or not - * @param int $level The minimum logging level at which this handler will be triggered - * @param bool $bubble Whether the messages that are handled can bubble up the stack or not - * @param bool $useSSL Whether to connect via SSL. - * @param string $format The format of the messages (default to text, can be set to html if you have html in the messages) - * @param string $host The HipChat server hostname. - * @param string $version The HipChat API version (default HipChatHandler::API_V1) - */ - public function __construct($token, $room, $name = 'Monolog', $notify = false, $level = Logger::CRITICAL, $bubble = true, $useSSL = true, $format = 'text', $host = 'api.hipchat.com', $version = self::API_V1) - { - if ($version == self::API_V1 && !$this->validateStringLength($name, static::MAXIMUM_NAME_LENGTH)) { - throw new \InvalidArgumentException('The supplied name is too long. HipChat\'s v1 API supports names up to 15 UTF-8 characters.'); - } - - $connectionString = $useSSL ? 'ssl://'.$host.':443' : $host.':80'; - parent::__construct($connectionString, $level, $bubble); - - $this->token = $token; - $this->name = $name; - $this->notify = $notify; - $this->room = $room; - $this->format = $format; - $this->host = $host; - $this->version = $version; - } - - /** - * {@inheritdoc} - * - * @param array $record - * @return string - */ - protected function generateDataStream($record) - { - $content = $this->buildContent($record); - - return $this->buildHeader($content) . $content; - } - - /** - * Builds the body of API call - * - * @param array $record - * @return string - */ - private function buildContent($record) - { - $dataArray = array( - 'notify' => $this->version == self::API_V1 ? - ($this->notify ? 1 : 0) : - ($this->notify ? 'true' : 'false'), - 'message' => $record['formatted'], - 'message_format' => $this->format, - 'color' => $this->getAlertColor($record['level']), - ); - - if (!$this->validateStringLength($dataArray['message'], static::MAXIMUM_MESSAGE_LENGTH)) { - if (function_exists('mb_substr')) { - $dataArray['message'] = mb_substr($dataArray['message'], 0, static::MAXIMUM_MESSAGE_LENGTH).' [truncated]'; - } else { - $dataArray['message'] = substr($dataArray['message'], 0, static::MAXIMUM_MESSAGE_LENGTH).' [truncated]'; - } - } - - // if we are using the legacy API then we need to send some additional information - if ($this->version == self::API_V1) { - $dataArray['room_id'] = $this->room; - } - - // append the sender name if it is set - // always append it if we use the v1 api (it is required in v1) - if ($this->version == self::API_V1 || $this->name !== null) { - $dataArray['from'] = (string) $this->name; - } - - return http_build_query($dataArray); - } - - /** - * Builds the header of the API Call - * - * @param string $content - * @return string - */ - private function buildHeader($content) - { - if ($this->version == self::API_V1) { - $header = "POST /v1/rooms/message?format=json&auth_token={$this->token} HTTP/1.1\r\n"; - } else { - // needed for rooms with special (spaces, etc) characters in the name - $room = rawurlencode($this->room); - $header = "POST /v2/room/{$room}/notification?auth_token={$this->token} HTTP/1.1\r\n"; - } - - $header .= "Host: {$this->host}\r\n"; - $header .= "Content-Type: application/x-www-form-urlencoded\r\n"; - $header .= "Content-Length: " . strlen($content) . "\r\n"; - $header .= "\r\n"; - - return $header; - } - - /** - * Assigns a color to each level of log records. - * - * @param int $level - * @return string - */ - protected function getAlertColor($level) - { - switch (true) { - case $level >= Logger::ERROR: - return 'red'; - case $level >= Logger::WARNING: - return 'yellow'; - case $level >= Logger::INFO: - return 'green'; - case $level == Logger::DEBUG: - return 'gray'; - default: - return 'yellow'; - } - } - - /** - * {@inheritdoc} - * - * @param array $record - */ - protected function write(array $record) - { - parent::write($record); - $this->finalizeWrite(); - } - - /** - * Finalizes the request by reading some bytes and then closing the socket - * - * If we do not read some but close the socket too early, hipchat sometimes - * drops the request entirely. - */ - protected function finalizeWrite() - { - $res = $this->getResource(); - if (is_resource($res)) { - @fread($res, 2048); - } - $this->closeSocket(); - } - - /** - * {@inheritdoc} - */ - public function handleBatch(array $records) - { - if (count($records) == 0) { - return true; - } - - $batchRecords = $this->combineRecords($records); - - $handled = false; - foreach ($batchRecords as $batchRecord) { - if ($this->isHandling($batchRecord)) { - $this->write($batchRecord); - $handled = true; - } - } - - if (!$handled) { - return false; - } - - return false === $this->bubble; - } - - /** - * Combines multiple records into one. Error level of the combined record - * will be the highest level from the given records. Datetime will be taken - * from the first record. - * - * @param $records - * @return array - */ - private function combineRecords($records) - { - $batchRecord = null; - $batchRecords = array(); - $messages = array(); - $formattedMessages = array(); - $level = 0; - $levelName = null; - $datetime = null; - - foreach ($records as $record) { - $record = $this->processRecord($record); - - if ($record['level'] > $level) { - $level = $record['level']; - $levelName = $record['level_name']; - } - - if (null === $datetime) { - $datetime = $record['datetime']; - } - - $messages[] = $record['message']; - $messageStr = implode(PHP_EOL, $messages); - $formattedMessages[] = $this->getFormatter()->format($record); - $formattedMessageStr = implode('', $formattedMessages); - - $batchRecord = array( - 'message' => $messageStr, - 'formatted' => $formattedMessageStr, - 'context' => array(), - 'extra' => array(), - ); - - if (!$this->validateStringLength($batchRecord['formatted'], static::MAXIMUM_MESSAGE_LENGTH)) { - // Pop the last message and implode the remaining messages - $lastMessage = array_pop($messages); - $lastFormattedMessage = array_pop($formattedMessages); - $batchRecord['message'] = implode(PHP_EOL, $messages); - $batchRecord['formatted'] = implode('', $formattedMessages); - - $batchRecords[] = $batchRecord; - $messages = array($lastMessage); - $formattedMessages = array($lastFormattedMessage); - - $batchRecord = null; - } - } - - if (null !== $batchRecord) { - $batchRecords[] = $batchRecord; - } - - // Set the max level and datetime for all records - foreach ($batchRecords as &$batchRecord) { - $batchRecord = array_merge( - $batchRecord, - array( - 'level' => $level, - 'level_name' => $levelName, - 'datetime' => $datetime, - ) - ); - } - - return $batchRecords; - } - - /** - * Validates the length of a string. - * - * If the `mb_strlen()` function is available, it will use that, as HipChat - * allows UTF-8 characters. Otherwise, it will fall back to `strlen()`. - * - * Note that this might cause false failures in the specific case of using - * a valid name with less than 16 characters, but 16 or more bytes, on a - * system where `mb_strlen()` is unavailable. - * - * @param string $str - * @param int $length - * - * @return bool - */ - private function validateStringLength($str, $length) - { - if (function_exists('mb_strlen')) { - return (mb_strlen($str) <= $length); - } - - return (strlen($str) <= $length); - } -} diff --git a/vendor/monolog/monolog/src/Monolog/Handler/IFTTTHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/IFTTTHandler.php index 7f22622..21043c5 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/IFTTTHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/IFTTTHandler.php @@ -1,4 +1,4 @@ -eventName = $eventName; $this->secretKey = $secretKey; @@ -46,13 +46,13 @@ class IFTTTHandler extends AbstractProcessingHandler /** * {@inheritdoc} */ - public function write(array $record) + public function write(array $record): void { - $postData = array( + $postData = [ "value1" => $record["channel"], "value2" => $record["level_name"], "value3" => $record["message"], - ); + ]; $postString = json_encode($postData); $ch = curl_init(); @@ -60,9 +60,9 @@ class IFTTTHandler extends AbstractProcessingHandler curl_setopt($ch, CURLOPT_POST, true); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch, CURLOPT_POSTFIELDS, $postString); - curl_setopt($ch, CURLOPT_HTTPHEADER, array( + curl_setopt($ch, CURLOPT_HTTPHEADER, [ "Content-Type: application/json", - )); + ]); Curl\Util::execute($ch); } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/InsightOpsHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/InsightOpsHandler.php index a12e3de..1f6d41f 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/InsightOpsHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/InsightOpsHandler.php @@ -1,4 +1,4 @@ -logToken . ' ' . $record['formatted']; } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/LogEntriesHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/LogEntriesHandler.php index ea89fb3..66de5f8 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/LogEntriesHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/LogEntriesHandler.php @@ -1,4 +1,4 @@ -logToken . ' ' . $record['formatted']; } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/LogglyHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/LogglyHandler.php index bcd62e1..c8befc2 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/LogglyHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/LogglyHandler.php @@ -1,4 +1,4 @@ -token = $token; @@ -42,26 +58,72 @@ class LogglyHandler extends AbstractProcessingHandler parent::__construct($level, $bubble); } - public function setTag($tag) + /** + * Loads and returns the shared curl handler for the given endpoint. + * + * @param string $endpoint + * + * @return resource + */ + protected function getCurlHandler(string $endpoint) { - $tag = !empty($tag) ? $tag : array(); - $this->tag = is_array($tag) ? $tag : array($tag); + if (!array_key_exists($endpoint, $this->curlHandlers)) { + $this->curlHandlers[$endpoint] = $this->loadCurlHandler($endpoint); + } + + return $this->curlHandlers[$endpoint]; } - public function addTag($tag) + /** + * Starts a fresh curl session for the given endpoint and returns its handler. + * + * @param string $endpoint + * + * @return resource + */ + private function loadCurlHandler(string $endpoint) + { + $url = sprintf("https://%s/%s/%s/", static::HOST, $endpoint, $this->token); + + $ch = curl_init(); + + curl_setopt($ch, CURLOPT_URL, $url); + curl_setopt($ch, CURLOPT_POST, true); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + + return $ch; + } + + /** + * @param string[]|string $tag + */ + public function setTag($tag): self + { + $tag = !empty($tag) ? $tag : []; + $this->tag = is_array($tag) ? $tag : [$tag]; + + return $this; + } + + /** + * @param string[]|string $tag + */ + public function addTag($tag): self { if (!empty($tag)) { - $tag = is_array($tag) ? $tag : array($tag); + $tag = is_array($tag) ? $tag : [$tag]; $this->tag = array_unique(array_merge($this->tag, $tag)); } + + return $this; } - protected function write(array $record) + protected function write(array $record): void { - $this->send($record["formatted"], self::ENDPOINT_SINGLE); + $this->send($record["formatted"], static::ENDPOINT_SINGLE); } - public function handleBatch(array $records) + public function handleBatch(array $records): void { $level = $this->level; @@ -70,32 +132,27 @@ class LogglyHandler extends AbstractProcessingHandler }); if ($records) { - $this->send($this->getFormatter()->formatBatch($records), self::ENDPOINT_BATCH); + $this->send($this->getFormatter()->formatBatch($records), static::ENDPOINT_BATCH); } } - protected function send($data, $endpoint) + protected function send(string $data, string $endpoint): void { - $url = sprintf("https://%s/%s/%s/", self::HOST, $endpoint, $this->token); + $ch = $this->getCurlHandler($endpoint); - $headers = array('Content-Type: application/json'); + $headers = ['Content-Type: application/json']; if (!empty($this->tag)) { $headers[] = 'X-LOGGLY-TAG: '.implode(',', $this->tag); } - $ch = curl_init(); - - curl_setopt($ch, CURLOPT_URL, $url); - curl_setopt($ch, CURLOPT_POST, true); curl_setopt($ch, CURLOPT_POSTFIELDS, $data); curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); - curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); - Curl\Util::execute($ch); + Curl\Util::execute($ch, 5, false); } - protected function getDefaultFormatter() + protected function getDefaultFormatter(): FormatterInterface { return new LogglyFormatter(); } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/LogmaticHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/LogmaticHandler.php new file mode 100644 index 0000000..209af16 --- /dev/null +++ b/vendor/monolog/monolog/src/Monolog/Handler/LogmaticHandler.php @@ -0,0 +1,88 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Monolog\Handler; + +use Monolog\Logger; +use Monolog\Formatter\FormatterInterface; +use Monolog\Formatter\LogmaticFormatter; + +/** + * @author Julien Breux + */ +class LogmaticHandler extends SocketHandler +{ + /** + * @var string + */ + private $logToken; + + /** + * @var string + */ + private $hostname; + + /** + * @var string + */ + private $appname; + + /** + * @param string $token Log token supplied by Logmatic. + * @param string $hostname Host name supplied by Logmatic. + * @param string $appname Application name supplied by Logmatic. + * @param bool $useSSL Whether or not SSL encryption should be used. + * @param int|string $level The minimum logging level to trigger this handler. + * @param bool $bubble Whether or not messages that are handled should bubble up the stack. + * + * @throws MissingExtensionException If SSL encryption is set to true and OpenSSL is missing + */ + public function __construct(string $token, string $hostname = '', string $appname = '', bool $useSSL = true, $level = Logger::DEBUG, bool $bubble = true) + { + if ($useSSL && !extension_loaded('openssl')) { + throw new MissingExtensionException('The OpenSSL PHP extension is required to use SSL encrypted connection for LogmaticHandler'); + } + + $endpoint = $useSSL ? 'ssl://api.logmatic.io:10515' : 'api.logmatic.io:10514'; + $endpoint .= '/v1/'; + + parent::__construct($endpoint, $level, $bubble); + + $this->logToken = $token; + $this->hostname = $hostname; + $this->appname = $appname; + } + + /** + * {@inheritdoc} + */ + protected function generateDataStream(array $record): string + { + return $this->logToken . ' ' . $record['formatted']; + } + + /** + * {@inheritdoc} + */ + protected function getDefaultFormatter(): FormatterInterface + { + $formatter = new LogmaticFormatter(); + + if (!empty($this->hostname)) { + $formatter->setHostname($this->hostname); + } + if (!empty($this->appname)) { + $formatter->setAppname($this->appname); + } + + return $formatter; + } +} diff --git a/vendor/monolog/monolog/src/Monolog/Handler/MailHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/MailHandler.php index 9e23283..3bbfd56 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/MailHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/MailHandler.php @@ -1,4 +1,4 @@ -level) { @@ -43,17 +46,17 @@ abstract class MailHandler extends AbstractProcessingHandler * @param string $content formatted email body to be sent * @param array $records the array of log records that formed this content */ - abstract protected function send($content, array $records); + abstract protected function send(string $content, array $records): void; /** * {@inheritdoc} */ - protected function write(array $record) + protected function write(array $record): void { - $this->send((string) $record['formatted'], array($record)); + $this->send((string) $record['formatted'], [$record]); } - protected function getHighestRecord(array $records) + protected function getHighestRecord(array $records): array { $highestRecord = null; foreach ($records as $record) { @@ -64,4 +67,19 @@ abstract class MailHandler extends AbstractProcessingHandler return $highestRecord; } + + protected function isHtmlBody(string $body): bool + { + return substr($body, 0, 1) === '<'; + } + + /** + * Gets the default formatter. + * + * @return FormatterInterface + */ + protected function getDefaultFormatter(): FormatterInterface + { + return new HtmlFormatter(); + } } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/MandrillHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/MandrillHandler.php index 3f0956a..46b8bff 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/MandrillHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/MandrillHandler.php @@ -1,4 +1,4 @@ -isHtmlBody($content)) { + $mime = 'text/html'; + } + $message = clone $this->message; - $message->setBody($content); - $message->setDate(time()); + $message->setBody($content, $mime); + if (version_compare(Swift::VERSION, '6.0.0', '>=')) { + $message->setDate(new \DateTimeImmutable()); + } else { + $message->setDate(time()); + } $ch = curl_init(); curl_setopt($ch, CURLOPT_URL, 'https://mandrillapp.com/api/1.0/messages/send-raw.json'); curl_setopt($ch, CURLOPT_POST, 1); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); - curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query(array( + curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query([ 'key' => $this->apiKey, 'raw_message' => (string) $message, 'async' => false, - ))); + ])); Curl\Util::execute($ch); } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/MissingExtensionException.php b/vendor/monolog/monolog/src/Monolog/Handler/MissingExtensionException.php index 4724a7e..3965aee 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/MissingExtensionException.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/MissingExtensionException.php @@ -1,4 +1,4 @@ - + * @author Christian Bergau */ class MissingExtensionException extends \Exception { diff --git a/vendor/monolog/monolog/src/Monolog/Handler/MongoDBHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/MongoDBHandler.php index 56fe755..e753917 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/MongoDBHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/MongoDBHandler.php @@ -1,4 +1,4 @@ -pushHandler($mongodb); * - * @author Thomas Tourlourat + * The above examples uses the MongoDB PHP library's client class; however, the + * MongoDB\Driver\Manager class from ext-mongodb is also supported. */ class MongoDBHandler extends AbstractProcessingHandler { - protected $mongoCollection; + private $collection; + private $manager; + private $namespace; - public function __construct($mongo, $database, $collection, $level = Logger::DEBUG, $bubble = true) + /** + * Constructor. + * + * @param Client|Manager $mongodb MongoDB library or driver client + * @param string $database Database name + * @param string $collection Collection name + * @param string|int $level The minimum logging level at which this handler will be triggered + * @param bool $bubble Whether the messages that are handled can bubble up the stack or not + */ + public function __construct($mongodb, string $database, string $collection, $level = Logger::DEBUG, bool $bubble = true) { - if (!($mongo instanceof \MongoClient || $mongo instanceof \Mongo || $mongo instanceof \MongoDB\Client)) { - throw new \InvalidArgumentException('MongoClient, Mongo or MongoDB\Client instance required'); + if (!($mongodb instanceof Client || $mongodb instanceof Manager)) { + throw new \InvalidArgumentException('MongoDB\Client or MongoDB\Driver\Manager instance required'); } - $this->mongoCollection = $mongo->selectCollection($database, $collection); + if ($mongodb instanceof Client) { + $this->collection = $mongodb->selectCollection($database, $collection); + } else { + $this->manager = $mongodb; + $this->namespace = $database . '.' . $collection; + } parent::__construct($level, $bubble); } - protected function write(array $record) + protected function write(array $record): void { - if ($this->mongoCollection instanceof \MongoDB\Collection) { - $this->mongoCollection->insertOne($record["formatted"]); - } else { - $this->mongoCollection->save($record["formatted"]); + if (isset($this->collection)) { + $this->collection->insertOne($record['formatted']); + } + + if (isset($this->manager, $this->namespace)) { + $bulk = new BulkWrite; + $bulk->insert($record["formatted"]); + $this->manager->executeBulkWrite($this->namespace, $bulk); } } /** * {@inheritDoc} */ - protected function getDefaultFormatter() + protected function getDefaultFormatter(): FormatterInterface { - return new NormalizerFormatter(); + return new MongoDBFormatter; } } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/NativeMailerHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/NativeMailerHandler.php index d7807fd..cd20561 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/NativeMailerHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/NativeMailerHandler.php @@ -1,4 +1,4 @@ -to = is_array($to) ? $to : array($to); + $this->to = (array) $to; $this->subject = $subject; $this->addHeader(sprintf('From: %s', $from)); $this->maxColumnWidth = $maxColumnWidth; @@ -84,10 +84,9 @@ class NativeMailerHandler extends MailHandler /** * Add headers to the message * - * @param string|array $headers Custom added headers - * @return self + * @param string|array $headers Custom added headers */ - public function addHeader($headers) + public function addHeader($headers): self { foreach ((array) $headers as $header) { if (strpos($header, "\n") !== false || strpos($header, "\r") !== false) { @@ -102,10 +101,9 @@ class NativeMailerHandler extends MailHandler /** * Add parameters to the message * - * @param string|array $parameters Custom added parameters - * @return self + * @param string|array $parameters Custom added parameters */ - public function addParameter($parameters) + public function addParameter($parameters): self { $this->parameters = array_merge($this->parameters, (array) $parameters); @@ -115,12 +113,17 @@ class NativeMailerHandler extends MailHandler /** * {@inheritdoc} */ - protected function send($content, array $records) + protected function send(string $content, array $records): void { - $content = wordwrap($content, $this->maxColumnWidth); + $contentType = $this->getContentType() ?: ($this->isHtmlBody($content) ? 'text/html' : 'text/plain'); + + if ($contentType !== 'text/html') { + $content = wordwrap($content, $this->maxColumnWidth); + } + $headers = ltrim(implode("\r\n", $this->headers) . "\r\n", "\r\n"); - $headers .= 'Content-type: ' . $this->getContentType() . '; charset=' . $this->getEncoding() . "\r\n"; - if ($this->getContentType() == 'text/html' && false === strpos($headers, 'MIME-Version:')) { + $headers .= 'Content-type: ' . $contentType . '; charset=' . $this->getEncoding() . "\r\n"; + if ($contentType === 'text/html' && false === strpos($headers, 'MIME-Version:')) { $headers .= 'MIME-Version: 1.0' . "\r\n"; } @@ -136,28 +139,20 @@ class NativeMailerHandler extends MailHandler } } - /** - * @return string $contentType - */ - public function getContentType() + public function getContentType(): ?string { return $this->contentType; } - /** - * @return string $encoding - */ - public function getEncoding() + public function getEncoding(): string { return $this->encoding; } /** - * @param string $contentType The content type of the email - Defaults to text/plain. Use text/html for HTML - * messages. - * @return self + * @param string $contentType The content type of the email - Defaults to text/plain. Use text/html for HTML messages. */ - public function setContentType($contentType) + public function setContentType(string $contentType): self { if (strpos($contentType, "\n") !== false || strpos($contentType, "\r") !== false) { throw new \InvalidArgumentException('The content type can not contain newline characters to prevent email header injection'); @@ -168,11 +163,7 @@ class NativeMailerHandler extends MailHandler return $this; } - /** - * @param string $encoding - * @return self - */ - public function setEncoding($encoding) + public function setEncoding(string $encoding): self { if (strpos($encoding, "\n") !== false || strpos($encoding, "\r") !== false) { throw new \InvalidArgumentException('The encoding can not contain newline characters to prevent email header injection'); diff --git a/vendor/monolog/monolog/src/Monolog/Handler/NewRelicHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/NewRelicHandler.php index f911997..5efd4e6 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/NewRelicHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/NewRelicHandler.php @@ -1,4 +1,4 @@ -isNewRelicEnabled()) { throw new MissingExtensionException('The newrelic PHP extension is required to use the NewRelicHandler'); @@ -86,7 +89,7 @@ class NewRelicHandler extends AbstractProcessingHandler unset($record['formatted']['context']['transaction_name']); } - if (isset($record['context']['exception']) && ($record['context']['exception'] instanceof \Exception || (PHP_VERSION_ID >= 70000 && $record['context']['exception'] instanceof \Throwable))) { + if (isset($record['context']['exception']) && $record['context']['exception'] instanceof \Throwable) { newrelic_notice_error($record['message'], $record['context']['exception']); unset($record['formatted']['context']['exception']); } else { @@ -123,7 +126,7 @@ class NewRelicHandler extends AbstractProcessingHandler * * @return bool */ - protected function isNewRelicEnabled() + protected function isNewRelicEnabled(): bool { return extension_loaded('newrelic'); } @@ -131,11 +134,8 @@ class NewRelicHandler extends AbstractProcessingHandler /** * Returns the appname where this log should be sent. Each log can override the default appname, set in this * handler's constructor, by providing the appname in it's context. - * - * @param array $context - * @return null|string */ - protected function getAppName(array $context) + protected function getAppName(array $context): ?string { if (isset($context['appname'])) { return $context['appname']; @@ -147,12 +147,8 @@ class NewRelicHandler extends AbstractProcessingHandler /** * Returns the name of the current transaction. Each log can override the default transaction name, set in this * handler's constructor, by providing the transaction_name in it's context - * - * @param array $context - * - * @return null|string */ - protected function getTransactionName(array $context) + protected function getTransactionName(array $context): ?string { if (isset($context['transaction_name'])) { return $context['transaction_name']; @@ -163,20 +159,16 @@ class NewRelicHandler extends AbstractProcessingHandler /** * Sets the NewRelic application that should receive this log. - * - * @param string $appName */ - protected function setNewRelicAppName($appName) + protected function setNewRelicAppName(string $appName): void { newrelic_set_appname($appName); } /** * Overwrites the name of the current transaction - * - * @param string $transactionName */ - protected function setNewRelicTransactionName($transactionName) + protected function setNewRelicTransactionName(string $transactionName): void { newrelic_name_transaction($transactionName); } @@ -185,7 +177,7 @@ class NewRelicHandler extends AbstractProcessingHandler * @param string $key * @param mixed $value */ - protected function setNewRelicParameter($key, $value) + protected function setNewRelicParameter(string $key, $value): void { if (null === $value || is_scalar($value)) { newrelic_add_custom_parameter($key, $value); @@ -197,7 +189,7 @@ class NewRelicHandler extends AbstractProcessingHandler /** * {@inheritDoc} */ - protected function getDefaultFormatter() + protected function getDefaultFormatter(): FormatterInterface { return new NormalizerFormatter(); } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/NoopHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/NoopHandler.php new file mode 100644 index 0000000..8ee2b4c --- /dev/null +++ b/vendor/monolog/monolog/src/Monolog/Handler/NoopHandler.php @@ -0,0 +1,40 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Monolog\Handler; + +/** + * No-op + * + * This handler handles anything, but does nothing, and does not stop bubbling to the rest of the stack. + * This can be used for testing, or to disable a handler when overriding a configuration without + * influencing the rest of the stack. + * + * @author Roel Harbers + */ +class NoopHandler extends Handler +{ + /** + * {@inheritdoc} + */ + public function isHandling(array $record): bool + { + return true; + } + + /** + * {@inheritdoc} + */ + public function handle(array $record): bool + { + return false; + } +} diff --git a/vendor/monolog/monolog/src/Monolog/Handler/NullHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/NullHandler.php index 4b84588..1f0078a 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/NullHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/NullHandler.php @@ -1,4 +1,4 @@ - */ -class NullHandler extends AbstractHandler +class NullHandler extends Handler { /** - * @param int $level The minimum logging level at which this handler will be triggered + * @var int + */ + private $level; + + /** + * @param string|int $level The minimum logging level at which this handler will be triggered */ public function __construct($level = Logger::DEBUG) { - parent::__construct($level, false); + $this->level = Logger::toMonologLevel($level); } /** * {@inheritdoc} */ - public function handle(array $record) + public function isHandling(array $record): bool { - if ($record['level'] < $this->level) { - return false; - } + return $record['level'] >= $this->level; + } - return true; + /** + * {@inheritdoc} + */ + public function handle(array $record): bool + { + return $record['level'] >= $this->level; } } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/OverflowHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/OverflowHandler.php new file mode 100644 index 0000000..3d034b9 --- /dev/null +++ b/vendor/monolog/monolog/src/Monolog/Handler/OverflowHandler.php @@ -0,0 +1,127 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Monolog\Handler; + +use Monolog\Logger; + +/** + * Handler to only pass log messages when a certain threshold of number of messages is reached. + * + * This can be useful in cases of processing a batch of data, but you're for example only interested + * in case it fails catastrophically instead of a warning for 1 or 2 events. Worse things can happen, right? + * + * Usage example: + * + * ``` + * $log = new Logger('application'); + * $handler = new SomeHandler(...) + * + * // Pass all warnings to the handler when more than 10 & all error messages when more then 5 + * $overflow = new OverflowHandler($handler, [Logger::WARNING => 10, Logger::ERROR => 5]); + * + * $log->pushHandler($overflow); + *``` + * + * @author Kris Buist + */ +class OverflowHandler extends AbstractHandler +{ + /** @var HandlerInterface */ + private $handler; + + /** @var int[] */ + private $thresholdMap = [ + Logger::DEBUG => 0, + Logger::INFO => 0, + Logger::NOTICE => 0, + Logger::WARNING => 0, + Logger::ERROR => 0, + Logger::CRITICAL => 0, + Logger::ALERT => 0, + Logger::EMERGENCY => 0, + ]; + + /** + * Buffer of all messages passed to the handler before the threshold was reached + * + * @var mixed[][] + */ + private $buffer = []; + + /** + * @param HandlerInterface $handler + * @param int[] $thresholdMap Dictionary of logger level => threshold + * @param int $level + * @param bool $bubble + */ + public function __construct( + HandlerInterface $handler, + array $thresholdMap = [], + int $level = Logger::DEBUG, + bool $bubble = true + ) { + $this->handler = $handler; + foreach ($thresholdMap as $thresholdLevel => $threshold) { + $this->thresholdMap[$thresholdLevel] = $threshold; + } + parent::__construct($level, $bubble); + } + + /** + * Handles a record. + * + * All records may be passed to this method, and the handler should discard + * those that it does not want to handle. + * + * The return value of this function controls the bubbling process of the handler stack. + * Unless the bubbling is interrupted (by returning true), the Logger class will keep on + * calling further handlers in the stack with a given log record. + * + * @param array $record The record to handle + * + * @return Boolean true means that this handler handled the record, and that bubbling is not permitted. + * false means the record was either not processed or that this handler allows bubbling. + */ + public function handle(array $record): bool + { + if ($record['level'] < $this->level) { + return false; + } + + $level = $record['level']; + + if (!isset($this->thresholdMap[$level])) { + $this->thresholdMap[$level] = 0; + } + + if ($this->thresholdMap[$level] > 0) { + // The overflow threshold is not yet reached, so we're buffering the record and lowering the threshold by 1 + $this->thresholdMap[$level]--; + $this->buffer[$level][] = $record; + + return false === $this->bubble; + } + + if ($this->thresholdMap[$level] == 0) { + // This current message is breaking the threshold. Flush the buffer and continue handling the current record + foreach ($this->buffer[$level] ?? [] as $buffered) { + $this->handler->handle($buffered); + } + $this->thresholdMap[$level]--; + unset($this->buffer[$level]); + } + + $this->handler->handle($record); + + return false === $this->bubble; + } +} diff --git a/vendor/monolog/monolog/src/Monolog/Handler/PHPConsoleHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/PHPConsoleHandler.php index 1f2076a..356e074 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/PHPConsoleHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/PHPConsoleHandler.php @@ -1,4 +1,4 @@ -addDebug('SELECT * FROM users', array('db', 'time' => 0.012)); + * $logger->debug('SELECT * FROM users', array('db', 'time' => 0.012)); * PC::debug($_SERVER); // PHP Console debugger for any type of vars * * @author Sergey Barbushin https://www.linkedin.com/in/barbushin */ class PHPConsoleHandler extends AbstractProcessingHandler { - private $options = array( + private $options = [ 'enabled' => true, // bool Is PHP Console server enabled - 'classesPartialsTraceIgnore' => array('Monolog\\'), // array Hide calls of classes started with... - 'debugTagsKeysInContext' => array(0, 'tag'), // bool Is PHP Console server enabled + 'classesPartialsTraceIgnore' => ['Monolog\\'], // array Hide calls of classes started with... + 'debugTagsKeysInContext' => [0, 'tag'], // bool Is PHP Console server enabled 'useOwnErrorsHandler' => false, // bool Enable errors handling 'useOwnExceptionsHandler' => false, // bool Enable exceptions handling 'sourcesBasePath' => null, // string Base path of all project sources to strip in errors source paths @@ -51,7 +51,7 @@ class PHPConsoleHandler extends AbstractProcessingHandler 'headersLimit' => null, // int|null Set headers size limit for your web-server 'password' => null, // string|null Protect PHP Console connection by password 'enableSslOnlyMode' => false, // bool Force connection by SSL for clients with PHP Console installed - 'ipMasks' => array(), // array Set IP masks of clients that will be allowed to connect to PHP Console: array('192.168.*.*', '127.0.0.1') + 'ipMasks' => [], // array Set IP masks of clients that will be allowed to connect to PHP Console: array('192.168.*.*', '127.0.0.1') 'enableEvalListener' => false, // bool Enable eval request to be handled by eval dispatcher(if enabled, 'password' option is also required) 'dumperDetectCallbacks' => false, // bool Convert callback items in dumper vars to (callback SomeClass::someMethod) strings 'dumperLevelLimit' => 5, // int Maximum dumped vars array or object nested dump level @@ -59,40 +59,43 @@ class PHPConsoleHandler extends AbstractProcessingHandler 'dumperItemSizeLimit' => 5000, // int Maximum length of any string or dumped array item 'dumperDumpSizeLimit' => 500000, // int Maximum approximate size of dumped vars result formatted in JSON 'detectDumpTraceAndSource' => false, // bool Autodetect and append trace data to debug - 'dataStorage' => null, // PhpConsole\Storage|null Fixes problem with custom $_SESSION handler(see http://goo.gl/Ne8juJ) - ); + 'dataStorage' => null, // \PhpConsole\Storage|null Fixes problem with custom $_SESSION handler(see http://goo.gl/Ne8juJ) + ]; /** @var Connector */ private $connector; /** - * @param array $options See \Monolog\Handler\PHPConsoleHandler::$options for more details - * @param Connector|null $connector Instance of \PhpConsole\Connector class (optional) - * @param int $level - * @param bool $bubble - * @throws Exception + * @param array $options See \Monolog\Handler\PHPConsoleHandler::$options for more details + * @param Connector|null $connector Instance of \PhpConsole\Connector class (optional) + * @param string|int $level The minimum logging level at which this handler will be triggered. + * @param bool $bubble Whether the messages that are handled can bubble up the stack or not. + * @throws \RuntimeException */ - public function __construct(array $options = array(), Connector $connector = null, $level = Logger::DEBUG, $bubble = true) + public function __construct(array $options = [], ?Connector $connector = null, $level = Logger::DEBUG, bool $bubble = true) { if (!class_exists('PhpConsole\Connector')) { - throw new Exception('PHP Console library not found. See https://github.com/barbushin/php-console#installation'); + throw new \RuntimeException('PHP Console library not found. See https://github.com/barbushin/php-console#installation'); } parent::__construct($level, $bubble); $this->options = $this->initOptions($options); $this->connector = $this->initConnector($connector); } - private function initOptions(array $options) + private function initOptions(array $options): array { $wrongOptions = array_diff(array_keys($options), array_keys($this->options)); if ($wrongOptions) { - throw new Exception('Unknown options: ' . implode(', ', $wrongOptions)); + throw new \RuntimeException('Unknown options: ' . implode(', ', $wrongOptions)); } return array_replace($this->options, $options); } - private function initConnector(Connector $connector = null) + /** + * @suppress PhanTypeMismatchArgument + */ + private function initConnector(?Connector $connector = null): Connector { if (!$connector) { if ($this->options['dataStorage']) { @@ -107,7 +110,7 @@ class PHPConsoleHandler extends AbstractProcessingHandler if ($this->options['enabled'] && $connector->isActiveClient()) { if ($this->options['useOwnErrorsHandler'] || $this->options['useOwnExceptionsHandler']) { - $handler = Handler::getInstance(); + $handler = VendorPhpConsoleHandler::getInstance(); $handler->setHandleErrors($this->options['useOwnErrorsHandler']); $handler->setHandleExceptions($this->options['useOwnExceptionsHandler']); $handler->start(); @@ -147,17 +150,17 @@ class PHPConsoleHandler extends AbstractProcessingHandler return $connector; } - public function getConnector() + public function getConnector(): Connector { return $this->connector; } - public function getOptions() + public function getOptions(): array { return $this->options; } - public function handle(array $record) + public function handle(array $record): bool { if ($this->options['enabled'] && $this->connector->isActiveClient()) { return parent::handle($record); @@ -168,22 +171,19 @@ class PHPConsoleHandler extends AbstractProcessingHandler /** * Writes the record down to the log of the implementing handler - * - * @param array $record - * @return void */ - protected function write(array $record) + protected function write(array $record): void { if ($record['level'] < Logger::NOTICE) { $this->handleDebugRecord($record); - } elseif (isset($record['context']['exception']) && $record['context']['exception'] instanceof Exception) { + } elseif (isset($record['context']['exception']) && $record['context']['exception'] instanceof \Throwable) { $this->handleExceptionRecord($record); } else { $this->handleErrorRecord($record); } } - private function handleDebugRecord(array $record) + private function handleDebugRecord(array $record): void { $tags = $this->getRecordTags($record); $message = $record['message']; @@ -193,20 +193,20 @@ class PHPConsoleHandler extends AbstractProcessingHandler $this->connector->getDebugDispatcher()->dispatchDebug($message, $tags, $this->options['classesPartialsTraceIgnore']); } - private function handleExceptionRecord(array $record) + private function handleExceptionRecord(array $record): void { $this->connector->getErrorsDispatcher()->dispatchException($record['context']['exception']); } - private function handleErrorRecord(array $record) + private function handleErrorRecord(array $record): void { $context = $record['context']; $this->connector->getErrorsDispatcher()->dispatchError( - isset($context['code']) ? $context['code'] : null, - isset($context['message']) ? $context['message'] : $record['message'], - isset($context['file']) ? $context['file'] : null, - isset($context['line']) ? $context['line'] : null, + $context['code'] ?? null, + $context['message'] ?? $record['message'], + $context['file'] ?? null, + $context['line'] ?? null, $this->options['classesPartialsTraceIgnore'] ); } @@ -235,7 +235,7 @@ class PHPConsoleHandler extends AbstractProcessingHandler /** * {@inheritDoc} */ - protected function getDefaultFormatter() + protected function getDefaultFormatter(): FormatterInterface { return new LineFormatter('%message%'); } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/ProcessHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/ProcessHandler.php new file mode 100644 index 0000000..36e30b8 --- /dev/null +++ b/vendor/monolog/monolog/src/Monolog/Handler/ProcessHandler.php @@ -0,0 +1,193 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Monolog\Handler; + +use Monolog\Logger; + +/** + * Stores to STDIN of any process, specified by a command. + * + * Usage example: + *
+ * $log = new Logger('myLogger');
+ * $log->pushHandler(new ProcessHandler('/usr/bin/php /var/www/monolog/someScript.php'));
+ * 
+ * + * @author Kolja Zuelsdorf + */ +class ProcessHandler extends AbstractProcessingHandler +{ + /** + * Holds the process to receive data on its STDIN. + * + * @var resource|bool|null + */ + private $process; + + /** + * @var string + */ + private $command; + + /** + * @var string|null + */ + private $cwd; + + /** + * @var array + */ + private $pipes = []; + + /** + * @var array + */ + protected const DESCRIPTOR_SPEC = [ + 0 => ['pipe', 'r'], // STDIN is a pipe that the child will read from + 1 => ['pipe', 'w'], // STDOUT is a pipe that the child will write to + 2 => ['pipe', 'w'], // STDERR is a pipe to catch the any errors + ]; + + /** + * @param string $command Command for the process to start. Absolute paths are recommended, + * especially if you do not use the $cwd parameter. + * @param string|int $level The minimum logging level at which this handler will be triggered. + * @param bool $bubble Whether the messages that are handled can bubble up the stack or not. + * @param string|null $cwd "Current working directory" (CWD) for the process to be executed in. + * @throws \InvalidArgumentException + */ + public function __construct(string $command, $level = Logger::DEBUG, bool $bubble = true, ?string $cwd = null) + { + if ($command === '') { + throw new \InvalidArgumentException('The command argument must be a non-empty string.'); + } + if ($cwd === '') { + throw new \InvalidArgumentException('The optional CWD argument must be a non-empty string or null.'); + } + + parent::__construct($level, $bubble); + + $this->command = $command; + $this->cwd = $cwd; + } + + /** + * Writes the record down to the log of the implementing handler + * + * @throws \UnexpectedValueException + */ + protected function write(array $record): void + { + $this->ensureProcessIsStarted(); + + $this->writeProcessInput($record['formatted']); + + $errors = $this->readProcessErrors(); + if (empty($errors) === false) { + throw new \UnexpectedValueException(sprintf('Errors while writing to process: %s', $errors)); + } + } + + /** + * Makes sure that the process is actually started, and if not, starts it, + * assigns the stream pipes, and handles startup errors, if any. + */ + private function ensureProcessIsStarted(): void + { + if (is_resource($this->process) === false) { + $this->startProcess(); + + $this->handleStartupErrors(); + } + } + + /** + * Starts the actual process and sets all streams to non-blocking. + */ + private function startProcess(): void + { + $this->process = proc_open($this->command, static::DESCRIPTOR_SPEC, $this->pipes, $this->cwd); + + foreach ($this->pipes as $pipe) { + stream_set_blocking($pipe, false); + } + } + + /** + * Selects the STDERR stream, handles upcoming startup errors, and throws an exception, if any. + * + * @throws \UnexpectedValueException + */ + private function handleStartupErrors(): void + { + $selected = $this->selectErrorStream(); + if (false === $selected) { + throw new \UnexpectedValueException('Something went wrong while selecting a stream.'); + } + + $errors = $this->readProcessErrors(); + + if (is_resource($this->process) === false || empty($errors) === false) { + throw new \UnexpectedValueException( + sprintf('The process "%s" could not be opened: ' . $errors, $this->command) + ); + } + } + + /** + * Selects the STDERR stream. + * + * @return int|bool + */ + protected function selectErrorStream() + { + $empty = []; + $errorPipes = [$this->pipes[2]]; + + return stream_select($errorPipes, $empty, $empty, 1); + } + + /** + * Reads the errors of the process, if there are any. + * + * @codeCoverageIgnore + * @return string Empty string if there are no errors. + */ + protected function readProcessErrors(): string + { + return stream_get_contents($this->pipes[2]); + } + + /** + * Writes to the input stream of the opened process. + * + * @codeCoverageIgnore + */ + protected function writeProcessInput(string $string): void + { + fwrite($this->pipes[0], $string); + } + + /** + * {@inheritdoc} + */ + public function close(): void + { + if (is_resource($this->process)) { + foreach ($this->pipes as $pipe) { + fclose($pipe); + } + proc_close($this->process); + $this->process = null; + } + } +} diff --git a/vendor/monolog/monolog/src/Monolog/Handler/ProcessableHandlerInterface.php b/vendor/monolog/monolog/src/Monolog/Handler/ProcessableHandlerInterface.php new file mode 100644 index 0000000..2c9557b --- /dev/null +++ b/vendor/monolog/monolog/src/Monolog/Handler/ProcessableHandlerInterface.php @@ -0,0 +1,38 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Monolog\Handler; + +use Monolog\Processor\ProcessorInterface; + +/** + * Interface to describe loggers that have processors + * + * @author Jordi Boggiano + */ +interface ProcessableHandlerInterface +{ + /** + * Adds a processor in the stack. + * + * @param ProcessorInterface|callable $callback + * @return HandlerInterface self + */ + public function pushProcessor(callable $callback): HandlerInterface; + + /** + * Removes the processor on top of the stack and returns it. + * + * @throws \LogicException In case the processor stack is empty + * @return callable + */ + public function popProcessor(): callable; +} diff --git a/vendor/monolog/monolog/src/Monolog/Handler/ProcessableHandlerTrait.php b/vendor/monolog/monolog/src/Monolog/Handler/ProcessableHandlerTrait.php new file mode 100644 index 0000000..c4c38ec --- /dev/null +++ b/vendor/monolog/monolog/src/Monolog/Handler/ProcessableHandlerTrait.php @@ -0,0 +1,71 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Monolog\Handler; + +use Monolog\ResettableInterface; + +/** + * Helper trait for implementing ProcessableInterface + * + * @author Jordi Boggiano + */ +trait ProcessableHandlerTrait +{ + /** + * @var callable[] + */ + protected $processors = []; + + /** + * {@inheritdoc} + * @suppress PhanTypeMismatchReturn + */ + public function pushProcessor(callable $callback): HandlerInterface + { + array_unshift($this->processors, $callback); + + return $this; + } + + /** + * {@inheritdoc} + */ + public function popProcessor(): callable + { + if (!$this->processors) { + throw new \LogicException('You tried to pop from an empty processor stack.'); + } + + return array_shift($this->processors); + } + + /** + * Processes a record. + */ + protected function processRecord(array $record): array + { + foreach ($this->processors as $processor) { + $record = $processor($record); + } + + return $record; + } + + protected function resetProcessors(): void + { + foreach ($this->processors as $processor) { + if ($processor instanceof ResettableInterface) { + $processor->reset(); + } + } + } +} diff --git a/vendor/monolog/monolog/src/Monolog/Handler/PsrHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/PsrHandler.php index a99e6ab..cba96a5 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/PsrHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/PsrHandler.php @@ -1,4 +1,4 @@ - */ -class PsrHandler extends AbstractHandler +class PsrHandler extends AbstractHandler implements FormattableHandlerInterface { /** * PSR-3 compliant logger @@ -28,12 +33,17 @@ class PsrHandler extends AbstractHandler */ protected $logger; + /** + * @var FormatterInterface|null + */ + protected $formatter; + /** * @param LoggerInterface $logger The underlying PSR-3 compliant logger to which messages will be proxied - * @param int $level The minimum logging level at which this handler will be triggered + * @param string|int $level The minimum logging level at which this handler will be triggered * @param bool $bubble Whether the messages that are handled can bubble up the stack or not */ - public function __construct(LoggerInterface $logger, $level = Logger::DEBUG, $bubble = true) + public function __construct(LoggerInterface $logger, $level = Logger::DEBUG, bool $bubble = true) { parent::__construct($level, $bubble); @@ -43,14 +53,45 @@ class PsrHandler extends AbstractHandler /** * {@inheritDoc} */ - public function handle(array $record) + public function handle(array $record): bool { if (!$this->isHandling($record)) { return false; } - $this->logger->log(strtolower($record['level_name']), $record['message'], $record['context']); + if ($this->formatter) { + $formatted = $this->formatter->format($record); + $this->logger->log(strtolower($record['level_name']), (string) $formatted, $record['context']); + } else { + $this->logger->log(strtolower($record['level_name']), $record['message'], $record['context']); + } return false === $this->bubble; } + + /** + * Sets the formatter. + * + * @param FormatterInterface $formatter + */ + public function setFormatter(FormatterInterface $formatter): HandlerInterface + { + $this->formatter = $formatter; + + return $this; + } + + /** + * Gets the formatter. + * + * @return FormatterInterface + */ + public function getFormatter(): FormatterInterface + { + if (!$this->formatter) { + throw new \LogicException('No formatter has been set and this handler does not have a default formatter'); + } + + return $this->formatter; + } } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/PushoverHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/PushoverHandler.php index f27bb3d..3bb99c7 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/PushoverHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/PushoverHandler.php @@ -1,4 +1,4 @@ - true, 'user' => true, 'message' => true, @@ -51,36 +52,48 @@ class PushoverHandler extends SocketHandler 'retry' => true, 'expire' => true, 'callback' => true, - ); + ]; /** * Sounds the api supports by default * @see https://pushover.net/api#sounds * @var array */ - private $sounds = array( + private $sounds = [ 'pushover', 'bike', 'bugle', 'cashregister', 'classical', 'cosmic', 'falling', 'gamelan', 'incoming', 'intermission', 'magic', 'mechanical', 'pianobar', 'siren', 'spacealarm', 'tugboat', 'alien', 'climb', 'persistent', 'echo', 'updown', 'none', - ); + ]; /** * @param string $token Pushover api token * @param string|array $users Pushover user id or array of ids the message will be sent to - * @param string $title Title sent to the Pushover API - * @param int $level The minimum logging level at which this handler will be triggered + * @param string|null $title Title sent to the Pushover API + * @param string|int $level The minimum logging level at which this handler will be triggered * @param bool $bubble Whether the messages that are handled can bubble up the stack or not * @param bool $useSSL Whether to connect via SSL. Required when pushing messages to users that are not * the pushover.net app owner. OpenSSL is required for this option. - * @param int $highPriorityLevel The minimum logging level at which this handler will start + * @param string|int $highPriorityLevel The minimum logging level at which this handler will start * sending "high priority" requests to the Pushover API - * @param int $emergencyLevel The minimum logging level at which this handler will start + * @param string|int $emergencyLevel The minimum logging level at which this handler will start * sending "emergency" requests to the Pushover API - * @param int $retry The retry parameter specifies how often (in seconds) the Pushover servers will send the same notification to the user. - * @param int $expire The expire parameter specifies how many seconds your notification will continue to be retried for (every retry seconds). + * @param int $retry The retry parameter specifies how often (in seconds) the Pushover servers will + * send the same notification to the user. + * @param int $expire The expire parameter specifies how many seconds your notification will continue + * to be retried for (every retry seconds). */ - public function __construct($token, $users, $title = null, $level = Logger::CRITICAL, $bubble = true, $useSSL = true, $highPriorityLevel = Logger::CRITICAL, $emergencyLevel = Logger::EMERGENCY, $retry = 30, $expire = 25200) - { + public function __construct( + string $token, + $users, + ?string $title = null, + $level = Logger::CRITICAL, + bool $bubble = true, + bool $useSSL = true, + $highPriorityLevel = Logger::CRITICAL, + $emergencyLevel = Logger::EMERGENCY, + int $retry = 30, + int $expire = 25200 + ) { $connectionString = $useSSL ? 'ssl://api.pushover.net:443' : 'api.pushover.net:80'; parent::__construct($connectionString, $level, $bubble); @@ -93,30 +106,30 @@ class PushoverHandler extends SocketHandler $this->expire = $expire; } - protected function generateDataStream($record) + protected function generateDataStream(array $record): string { $content = $this->buildContent($record); return $this->buildHeader($content) . $content; } - private function buildContent($record) + private function buildContent(array $record): string { // Pushover has a limit of 512 characters on title and message combined. $maxMessageLength = 512 - strlen($this->title); $message = ($this->useFormattedMessage) ? $record['formatted'] : $record['message']; - $message = substr($message, 0, $maxMessageLength); + $message = Utils::substr($message, 0, $maxMessageLength); $timestamp = $record['datetime']->getTimestamp(); - $dataArray = array( + $dataArray = [ 'token' => $this->token, 'user' => $this->user, 'message' => $message, 'title' => $this->title, 'timestamp' => $timestamp, - ); + ]; if (isset($record['level']) && $record['level'] >= $this->emergencyLevel) { $dataArray['priority'] = 2; @@ -141,7 +154,7 @@ class PushoverHandler extends SocketHandler return http_build_query($dataArray); } - private function buildHeader($content) + private function buildHeader(string $content): string { $header = "POST /1/messages.json HTTP/1.1\r\n"; $header .= "Host: api.pushover.net\r\n"; @@ -152,7 +165,7 @@ class PushoverHandler extends SocketHandler return $header; } - protected function write(array $record) + protected function write(array $record): void { foreach ($this->users as $user) { $this->user = $user; @@ -164,22 +177,27 @@ class PushoverHandler extends SocketHandler $this->user = null; } - public function setHighPriorityLevel($value) + public function setHighPriorityLevel($value): self { - $this->highPriorityLevel = $value; + $this->highPriorityLevel = Logger::toMonologLevel($value); + + return $this; } - public function setEmergencyLevel($value) + public function setEmergencyLevel($value): self { - $this->emergencyLevel = $value; + $this->emergencyLevel = Logger::toMonologLevel($value); + + return $this; } /** * Use the formatted message? - * @param bool $value */ - public function useFormattedMessage($value) + public function useFormattedMessage(bool $value): self { - $this->useFormattedMessage = (bool) $value; + $this->useFormattedMessage = $value; + + return $this; } } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/RavenHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/RavenHandler.php deleted file mode 100644 index 10d7f43..0000000 --- a/vendor/monolog/monolog/src/Monolog/Handler/RavenHandler.php +++ /dev/null @@ -1,232 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\Formatter\LineFormatter; -use Monolog\Formatter\FormatterInterface; -use Monolog\Logger; -use Raven_Client; - -/** - * Handler to send messages to a Sentry (https://github.com/getsentry/sentry) server - * using sentry-php (https://github.com/getsentry/sentry-php) - * - * @author Marc Abramowitz - */ -class RavenHandler extends AbstractProcessingHandler -{ - /** - * Translates Monolog log levels to Raven log levels. - */ - protected $logLevels = array( - Logger::DEBUG => Raven_Client::DEBUG, - Logger::INFO => Raven_Client::INFO, - Logger::NOTICE => Raven_Client::INFO, - Logger::WARNING => Raven_Client::WARNING, - Logger::ERROR => Raven_Client::ERROR, - Logger::CRITICAL => Raven_Client::FATAL, - Logger::ALERT => Raven_Client::FATAL, - Logger::EMERGENCY => Raven_Client::FATAL, - ); - - /** - * @var string should represent the current version of the calling - * software. Can be any string (git commit, version number) - */ - protected $release; - - /** - * @var Raven_Client the client object that sends the message to the server - */ - protected $ravenClient; - - /** - * @var LineFormatter The formatter to use for the logs generated via handleBatch() - */ - protected $batchFormatter; - - /** - * @param Raven_Client $ravenClient - * @param int $level The minimum logging level at which this handler will be triggered - * @param bool $bubble Whether the messages that are handled can bubble up the stack or not - */ - public function __construct(Raven_Client $ravenClient, $level = Logger::DEBUG, $bubble = true) - { - parent::__construct($level, $bubble); - - $this->ravenClient = $ravenClient; - } - - /** - * {@inheritdoc} - */ - public function handleBatch(array $records) - { - $level = $this->level; - - // filter records based on their level - $records = array_filter($records, function ($record) use ($level) { - return $record['level'] >= $level; - }); - - if (!$records) { - return; - } - - // the record with the highest severity is the "main" one - $record = array_reduce($records, function ($highest, $record) { - if ($record['level'] > $highest['level']) { - return $record; - } - - return $highest; - }); - - // the other ones are added as a context item - $logs = array(); - foreach ($records as $r) { - $logs[] = $this->processRecord($r); - } - - if ($logs) { - $record['context']['logs'] = (string) $this->getBatchFormatter()->formatBatch($logs); - } - - $this->handle($record); - } - - /** - * Sets the formatter for the logs generated by handleBatch(). - * - * @param FormatterInterface $formatter - */ - public function setBatchFormatter(FormatterInterface $formatter) - { - $this->batchFormatter = $formatter; - } - - /** - * Gets the formatter for the logs generated by handleBatch(). - * - * @return FormatterInterface - */ - public function getBatchFormatter() - { - if (!$this->batchFormatter) { - $this->batchFormatter = $this->getDefaultBatchFormatter(); - } - - return $this->batchFormatter; - } - - /** - * {@inheritdoc} - */ - protected function write(array $record) - { - $previousUserContext = false; - $options = array(); - $options['level'] = $this->logLevels[$record['level']]; - $options['tags'] = array(); - if (!empty($record['extra']['tags'])) { - $options['tags'] = array_merge($options['tags'], $record['extra']['tags']); - unset($record['extra']['tags']); - } - if (!empty($record['context']['tags'])) { - $options['tags'] = array_merge($options['tags'], $record['context']['tags']); - unset($record['context']['tags']); - } - if (!empty($record['context']['fingerprint'])) { - $options['fingerprint'] = $record['context']['fingerprint']; - unset($record['context']['fingerprint']); - } - if (!empty($record['context']['logger'])) { - $options['logger'] = $record['context']['logger']; - unset($record['context']['logger']); - } else { - $options['logger'] = $record['channel']; - } - foreach ($this->getExtraParameters() as $key) { - foreach (array('extra', 'context') as $source) { - if (!empty($record[$source][$key])) { - $options[$key] = $record[$source][$key]; - unset($record[$source][$key]); - } - } - } - if (!empty($record['context'])) { - $options['extra']['context'] = $record['context']; - if (!empty($record['context']['user'])) { - $previousUserContext = $this->ravenClient->context->user; - $this->ravenClient->user_context($record['context']['user']); - unset($options['extra']['context']['user']); - } - } - if (!empty($record['extra'])) { - $options['extra']['extra'] = $record['extra']; - } - - if (!empty($this->release) && !isset($options['release'])) { - $options['release'] = $this->release; - } - - if (isset($record['context']['exception']) && ($record['context']['exception'] instanceof \Exception || (PHP_VERSION_ID >= 70000 && $record['context']['exception'] instanceof \Throwable))) { - $options['message'] = $record['formatted']; - $this->ravenClient->captureException($record['context']['exception'], $options); - } else { - $this->ravenClient->captureMessage($record['formatted'], array(), $options); - } - - if ($previousUserContext !== false) { - $this->ravenClient->user_context($previousUserContext); - } - } - - /** - * {@inheritDoc} - */ - protected function getDefaultFormatter() - { - return new LineFormatter('[%channel%] %message%'); - } - - /** - * Gets the default formatter for the logs generated by handleBatch(). - * - * @return FormatterInterface - */ - protected function getDefaultBatchFormatter() - { - return new LineFormatter(); - } - - /** - * Gets extra parameters supported by Raven that can be found in "extra" and "context" - * - * @return array - */ - protected function getExtraParameters() - { - return array('contexts', 'checksum', 'release', 'event_id'); - } - - /** - * @param string $value - * @return self - */ - public function setRelease($value) - { - $this->release = $value; - - return $this; - } -} diff --git a/vendor/monolog/monolog/src/Monolog/Handler/RedisHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/RedisHandler.php index 590f996..3894513 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/RedisHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/RedisHandler.php @@ -1,4 +1,4 @@ -capSize) { $this->writeCapped($record); @@ -66,11 +67,8 @@ class RedisHandler extends AbstractProcessingHandler /** * Write and cap the collection * Writes the record to the redis list and caps its - * - * @param array $record associative record array - * @return void */ - protected function writeCapped(array $record) + protected function writeCapped(array $record): void { if ($this->redisClient instanceof \Redis) { $this->redisClient->multi() @@ -90,7 +88,7 @@ class RedisHandler extends AbstractProcessingHandler /** * {@inheritDoc} */ - protected function getDefaultFormatter() + protected function getDefaultFormatter(): FormatterInterface { return new LineFormatter(); } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/RollbarHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/RollbarHandler.php index 65073ff..979d651 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/RollbarHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/RollbarHandler.php @@ -1,4 +1,4 @@ - 'debug', Logger::INFO => 'info', Logger::NOTICE => 'info', @@ -49,7 +47,7 @@ class RollbarHandler extends AbstractProcessingHandler Logger::CRITICAL => 'critical', Logger::ALERT => 'critical', Logger::EMERGENCY => 'critical', - ); + ]; /** * Records whether any log records have been added since the last flush of the rollbar notifier @@ -61,13 +59,13 @@ class RollbarHandler extends AbstractProcessingHandler protected $initialized = false; /** - * @param RollbarNotifier $rollbarNotifier RollbarNotifier object constructed with valid token - * @param int $level The minimum logging level at which this handler will be triggered - * @param bool $bubble Whether the messages that are handled can bubble up the stack or not + * @param RollbarLogger $rollbarLogger RollbarLogger object constructed with valid token + * @param string|int $level The minimum logging level at which this handler will be triggered + * @param bool $bubble Whether the messages that are handled can bubble up the stack or not */ - public function __construct(RollbarNotifier $rollbarNotifier, $level = Logger::ERROR, $bubble = true) + public function __construct(RollbarLogger $rollbarLogger, $level = Logger::ERROR, bool $bubble = true) { - $this->rollbarNotifier = $rollbarNotifier; + $this->rollbarLogger = $rollbarLogger; parent::__construct($level, $bubble); } @@ -75,7 +73,7 @@ class RollbarHandler extends AbstractProcessingHandler /** * {@inheritdoc} */ - protected function write(array $record) + protected function write(array $record): void { if (!$this->initialized) { // __destructor() doesn't get called on Fatal errors @@ -84,40 +82,30 @@ class RollbarHandler extends AbstractProcessingHandler } $context = $record['context']; - $payload = array(); - if (isset($context['payload'])) { - $payload = $context['payload']; - unset($context['payload']); - } - $context = array_merge($context, $record['extra'], array( + $context = array_merge($context, $record['extra'], [ 'level' => $this->levelMap[$record['level']], 'monolog_level' => $record['level_name'], 'channel' => $record['channel'], 'datetime' => $record['datetime']->format('U'), - )); + ]); - if (isset($context['exception']) && $context['exception'] instanceof Exception) { - $payload['level'] = $context['level']; + if (isset($context['exception']) && $context['exception'] instanceof Throwable) { $exception = $context['exception']; unset($context['exception']); - - $this->rollbarNotifier->report_exception($exception, $context, $payload); + $toLog = $exception; } else { - $this->rollbarNotifier->report_message( - $record['message'], - $context['level'], - $context, - $payload - ); + $toLog = $record['message']; } + $this->rollbarLogger->log($context['level'], $toLog, $context); + $this->hasRecords = true; } - public function flush() + public function flush(): void { if ($this->hasRecords) { - $this->rollbarNotifier->flush(); + $this->rollbarLogger->flush(); $this->hasRecords = false; } } @@ -125,7 +113,7 @@ class RollbarHandler extends AbstractProcessingHandler /** * {@inheritdoc} */ - public function close() + public function close(): void { $this->flush(); } @@ -139,6 +127,4 @@ class RollbarHandler extends AbstractProcessingHandler parent::reset(); } - - } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php index ae2309f..c1ff25b 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php @@ -1,4 +1,4 @@ -filename = $filename; - $this->maxFiles = (int) $maxFiles; - $this->nextRotation = new \DateTime('tomorrow'); + $this->maxFiles = $maxFiles; + $this->nextRotation = new \DateTimeImmutable('tomorrow'); $this->filenameFormat = '{filename}-{date}'; - $this->dateFormat = 'Y-m-d'; + $this->dateFormat = static::FILE_PER_DAY; parent::__construct($this->getTimedFilename(), $level, $bubble, $filePermission, $useLocking); } @@ -57,7 +58,7 @@ class RotatingFileHandler extends StreamHandler /** * {@inheritdoc} */ - public function close() + public function close(): void { parent::close(); @@ -78,40 +79,40 @@ class RotatingFileHandler extends StreamHandler } } - public function setFilenameFormat($filenameFormat, $dateFormat) + public function setFilenameFormat(string $filenameFormat, string $dateFormat): self { - if (!preg_match('{^Y(([/_.-]?m)([/_.-]?d)?)?$}', $dateFormat)) { - trigger_error( + if (!preg_match('{^[Yy](([/_.-]?m)([/_.-]?d)?)?$}', $dateFormat)) { + throw new InvalidArgumentException( 'Invalid date format - format must be one of '. 'RotatingFileHandler::FILE_PER_DAY ("Y-m-d"), RotatingFileHandler::FILE_PER_MONTH ("Y-m") '. 'or RotatingFileHandler::FILE_PER_YEAR ("Y"), or you can set one of the '. - 'date formats using slashes, underscores and/or dots instead of dashes.', - E_USER_DEPRECATED + 'date formats using slashes, underscores and/or dots instead of dashes.' ); } if (substr_count($filenameFormat, '{date}') === 0) { - trigger_error( - 'Invalid filename format - format should contain at least `{date}`, because otherwise rotating is impossible.', - E_USER_DEPRECATED + throw new InvalidArgumentException( + 'Invalid filename format - format must contain at least `{date}`, because otherwise rotating is impossible.' ); } $this->filenameFormat = $filenameFormat; $this->dateFormat = $dateFormat; $this->url = $this->getTimedFilename(); $this->close(); + + return $this; } /** * {@inheritdoc} */ - protected function write(array $record) + protected function write(array $record): void { // on the first record written, if the log is new, we should rotate (once per day) if (null === $this->mustRotate) { $this->mustRotate = !file_exists($this->url); } - if ($this->nextRotation < $record['datetime']) { + if ($this->nextRotation <= $record['datetime']) { $this->mustRotate = true; $this->close(); } @@ -122,11 +123,11 @@ class RotatingFileHandler extends StreamHandler /** * Rotates the files. */ - protected function rotate() + protected function rotate(): void { // update filename $this->url = $this->getTimedFilename(); - $this->nextRotation = new \DateTime('tomorrow'); + $this->nextRotation = new \DateTimeImmutable('tomorrow'); // skip GC of old logs if files are unlimited if (0 === $this->maxFiles) { @@ -148,7 +149,9 @@ class RotatingFileHandler extends StreamHandler if (is_writable($file)) { // suppress errors here as unlink() might fail if two processes // are cleaning up/rotating at the same time - set_error_handler(function ($errno, $errstr, $errfile, $errline) {}); + set_error_handler(function (int $errno, string $errstr, string $errfile, int $errline): bool { + return false; + }); unlink($file); restore_error_handler(); } @@ -157,12 +160,12 @@ class RotatingFileHandler extends StreamHandler $this->mustRotate = false; } - protected function getTimedFilename() + protected function getTimedFilename(): string { $fileInfo = pathinfo($this->filename); $timedFilename = str_replace( - array('{filename}', '{date}'), - array($fileInfo['filename'], date($this->dateFormat)), + ['{filename}', '{date}'], + [$fileInfo['filename'], date($this->dateFormat)], $fileInfo['dirname'] . '/' . $this->filenameFormat ); @@ -173,12 +176,12 @@ class RotatingFileHandler extends StreamHandler return $timedFilename; } - protected function getGlobPattern() + protected function getGlobPattern(): string { $fileInfo = pathinfo($this->filename); $glob = str_replace( - array('{filename}', '{date}'), - array($fileInfo['filename'], '[0-9][0-9][0-9][0-9]*'), + ['{filename}', '{date}'], + [$fileInfo['filename'], '[0-9][0-9][0-9][0-9]*'], $fileInfo['dirname'] . '/' . $this->filenameFormat ); if (!empty($fileInfo['extension'])) { diff --git a/vendor/monolog/monolog/src/Monolog/Handler/SamplingHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/SamplingHandler.php index 9509ae3..814c904 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/SamplingHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/SamplingHandler.php @@ -1,4 +1,4 @@ - * @author Kunal Mehta */ -class SamplingHandler extends AbstractHandler +class SamplingHandler extends AbstractHandler implements ProcessableHandlerInterface { + use ProcessableHandlerTrait; + /** * @var callable|HandlerInterface $handler */ @@ -39,9 +41,9 @@ class SamplingHandler extends AbstractHandler /** * @param callable|HandlerInterface $handler Handler or factory callable($record, $fingersCrossedHandler). - * @param int $factor Sample factor + * @param int $factor Sample factor (e.g. 10 means every ~10th record is sampled) */ - public function __construct($handler, $factor) + public function __construct($handler, int $factor) { parent::__construct(); $this->handler = $handler; @@ -52,12 +54,12 @@ class SamplingHandler extends AbstractHandler } } - public function isHandling(array $record) + public function isHandling(array $record): bool { return $this->handler->isHandling($record); } - public function handle(array $record) + public function handle(array $record): bool { if ($this->isHandling($record) && mt_rand(1, $this->factor) === 1) { // The same logic as in FingersCrossedHandler @@ -69,9 +71,7 @@ class SamplingHandler extends AbstractHandler } if ($this->processors) { - foreach ($this->processors as $processor) { - $record = call_user_func($processor, $record); - } + $record = $this->processRecord($record); } $this->handler->handle($record); diff --git a/vendor/monolog/monolog/src/Monolog/Handler/SendGridHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/SendGridHandler.php new file mode 100644 index 0000000..c154a5d --- /dev/null +++ b/vendor/monolog/monolog/src/Monolog/Handler/SendGridHandler.php @@ -0,0 +1,100 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Monolog\Handler; + +use Monolog\Logger; + +/** + * SendGridrHandler uses the SendGrid API v2 function to send Log emails, more information in https://sendgrid.com/docs/API_Reference/Web_API/mail.html + * + * @author Ricardo Fontanelli + */ +class SendGridHandler extends MailHandler +{ + /** + * The SendGrid API User + * @var string + */ + protected $apiUser; + + /** + * The SendGrid API Key + * @var string + */ + protected $apiKey; + + /** + * The email addresses to which the message will be sent + * @var string + */ + protected $from; + + /** + * The email addresses to which the message will be sent + * @var array + */ + protected $to; + + /** + * The subject of the email + * @var string + */ + protected $subject; + + /** + * @param string $apiUser The SendGrid API User + * @param string $apiKey The SendGrid API Key + * @param string $from The sender of the email + * @param string|array $to The recipients of the email + * @param string $subject The subject of the mail + * @param int $level The minimum logging level at which this handler will be triggered + * @param bool $bubble Whether the messages that are handled can bubble up the stack or not + */ + public function __construct(string $apiUser, string $apiKey, string $from, $to, string $subject, int $level = Logger::ERROR, bool $bubble = true) + { + parent::__construct($level, $bubble); + $this->apiUser = $apiUser; + $this->apiKey = $apiKey; + $this->from = $from; + $this->to = (array) $to; + $this->subject = $subject; + } + + /** + * {@inheritdoc} + */ + protected function send(string $content, array $records): void + { + $message = []; + $message['api_user'] = $this->apiUser; + $message['api_key'] = $this->apiKey; + $message['from'] = $this->from; + foreach ($this->to as $recipient) { + $message['to[]'] = $recipient; + } + $message['subject'] = $this->subject; + $message['date'] = date('r'); + + if ($this->isHtmlBody($content)) { + $message['html'] = $content; + } else { + $message['text'] = $content; + } + + $ch = curl_init(); + curl_setopt($ch, CURLOPT_URL, 'https://api.sendgrid.com/api/mail.send.json'); + curl_setopt($ch, CURLOPT_POST, 1); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($message)); + Curl\Util::execute($ch, 2); + } +} diff --git a/vendor/monolog/monolog/src/Monolog/Handler/Slack/SlackRecord.php b/vendor/monolog/monolog/src/Monolog/Handler/Slack/SlackRecord.php old mode 100755 new mode 100644 index e55e0e2..c082136 --- a/vendor/monolog/monolog/src/Monolog/Handler/Slack/SlackRecord.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/Slack/SlackRecord.php @@ -1,4 +1,4 @@ -channel = $channel; - $this->username = $username; - $this->userIcon = trim($userIcon, ':'); - $this->useAttachment = $useAttachment; - $this->useShortAttachment = $useShortAttachment; - $this->includeContextAndExtra = $includeContextAndExtra; - $this->excludeFields = $excludeFields; - $this->formatter = $formatter; + public function __construct( + ?string $channel = null, + ?string $username = null, + bool $useAttachment = true, + ?string $userIcon = null, + bool $useShortAttachment = false, + bool $includeContextAndExtra = false, + array $excludeFields = array(), + FormatterInterface $formatter = null + ) { + $this + ->setChannel($channel) + ->setUsername($username) + ->useAttachment($useAttachment) + ->setUserIcon($userIcon) + ->useShortAttachment($useShortAttachment) + ->includeContextAndExtra($includeContextAndExtra) + ->excludeFields($excludeFields) + ->setFormatter($formatter); if ($this->includeContextAndExtra) { $this->normalizerFormatter = new NormalizerFormatter(); } } - public function getSlackData(array $record) + /** + * Returns required data in format that Slack + * is expecting. + */ + public function getSlackData(array $record): array { $dataArray = array(); - $record = $this->excludeFields($record); + $record = $this->removeExcludedFields($record); if ($this->username) { $dataArray['username'] = $this->username; @@ -127,7 +140,7 @@ class SlackRecord 'color' => $this->getAttachmentColor($record['level']), 'fields' => array(), 'mrkdwn_in' => array('fields'), - 'ts' => $record['datetime']->getTimestamp() + 'ts' => $record['datetime']->getTimestamp(), ); if ($this->useShortAttachment) { @@ -137,7 +150,6 @@ class SlackRecord $attachment['fields'][] = $this->generateAttachmentField('Level', $record['level_name']); } - if ($this->includeContextAndExtra) { foreach (array('extra', 'context') as $key) { if (empty($record[$key])) { @@ -176,34 +188,27 @@ class SlackRecord } /** - * Returned a Slack message attachment color associated with + * Returns a Slack message attachment color associated with * provided level. - * - * @param int $level - * @return string */ - public function getAttachmentColor($level) + public function getAttachmentColor(int $level): string { switch (true) { case $level >= Logger::ERROR: - return self::COLOR_DANGER; + return static::COLOR_DANGER; case $level >= Logger::WARNING: - return self::COLOR_WARNING; + return static::COLOR_WARNING; case $level >= Logger::INFO: - return self::COLOR_GOOD; + return static::COLOR_GOOD; default: - return self::COLOR_DEFAULT; + return static::COLOR_DEFAULT; } } /** * Stringifies an array of key/value pairs to be used in attachment fields - * - * @param array $fields - * - * @return string */ - public function stringify($fields) + public function stringify(array $fields): string { $normalized = $this->normalizerFormatter->format($fields); $prettyPrintFlag = defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 128; @@ -212,49 +217,110 @@ class SlackRecord $hasNonNumericKeys = !count(array_filter(array_keys($normalized), 'is_numeric')); return $hasSecondDimension || $hasNonNumericKeys - ? json_encode($normalized, $prettyPrintFlag) - : json_encode($normalized); + ? json_encode($normalized, $prettyPrintFlag|JSON_UNESCAPED_UNICODE) + : json_encode($normalized, JSON_UNESCAPED_UNICODE); } /** - * Sets the formatter + * Channel used by the bot when posting * - * @param FormatterInterface $formatter + * @param ?string $channel + * + * @return SlackHandler */ - public function setFormatter(FormatterInterface $formatter) + public function setChannel(?string $channel = null): self + { + $this->channel = $channel; + + return $this; + } + + /** + * Username used by the bot when posting + * + * @param ?string $username + * + * @return SlackHandler + */ + public function setUsername(?string $username = null): self + { + $this->username = $username; + + return $this; + } + + public function useAttachment(bool $useAttachment = true): self + { + $this->useAttachment = $useAttachment; + + return $this; + } + + public function setUserIcon(?string $userIcon = null): self + { + $this->userIcon = $userIcon; + + if (\is_string($userIcon)) { + $this->userIcon = trim($userIcon, ':'); + } + + return $this; + } + + public function useShortAttachment(bool $useShortAttachment = false): self + { + $this->useShortAttachment = $useShortAttachment; + + return $this; + } + + public function includeContextAndExtra(bool $includeContextAndExtra = false): self + { + $this->includeContextAndExtra = $includeContextAndExtra; + + if ($this->includeContextAndExtra) { + $this->normalizerFormatter = new NormalizerFormatter(); + } + + return $this; + } + + public function excludeFields(array $excludeFields = []): self + { + $this->excludeFields = $excludeFields; + + return $this; + } + + public function setFormatter(?FormatterInterface $formatter = null): self { $this->formatter = $formatter; + + return $this; } /** * Generates attachment field * - * @param string $title * @param string|array $value - * - * @return array */ - private function generateAttachmentField($title, $value) + private function generateAttachmentField(string $title, $value): array { $value = is_array($value) - ? sprintf('```%s```', $this->stringify($value)) + ? sprintf('```%s```', substr($this->stringify($value), 0, 1990)) : $value; return array( 'title' => ucfirst($title), 'value' => $value, - 'short' => false + 'short' => false, ); } /** * Generates a collection of attachment fields from array - * - * @param array $data - * - * @return array */ - private function generateAttachmentFields(array $data) + private function generateAttachmentFields(array $data): array { $fields = array(); foreach ($this->normalizerFormatter->format($data) as $key => $value) { @@ -266,12 +332,8 @@ class SlackRecord /** * Get a copy of record with fields excluded according to $this->excludeFields - * - * @param array $record - * - * @return array */ - private function excludeFields(array $record) + private function removeExcludedFields(array $record): array { foreach ($this->excludeFields as $field) { $keys = explode('.', $field); diff --git a/vendor/monolog/monolog/src/Monolog/Handler/SlackHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/SlackHandler.php index 45d634f..8a6bfdc 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/SlackHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/SlackHandler.php @@ -1,4 +1,4 @@ -formatter + $excludeFields ); $this->token = $token; } - public function getSlackRecord() + public function getSlackRecord(): SlackRecord { return $this->slackRecord; } - public function getToken() + public function getToken(): string { return $this->token; } /** * {@inheritdoc} - * - * @param array $record - * @return string */ - protected function generateDataStream($record) + protected function generateDataStream(array $record): string { $content = $this->buildContent($record); @@ -95,24 +101,15 @@ class SlackHandler extends SocketHandler /** * Builds the body of API call - * - * @param array $record - * @return string */ - private function buildContent($record) + private function buildContent(array $record): string { $dataArray = $this->prepareContentData($record); return http_build_query($dataArray); } - /** - * Prepares content data - * - * @param array $record - * @return array - */ - protected function prepareContentData($record) + protected function prepareContentData(array $record): array { $dataArray = $this->slackRecord->getSlackData($record); $dataArray['token'] = $this->token; @@ -126,11 +123,8 @@ class SlackHandler extends SocketHandler /** * Builds the header of the API Call - * - * @param string $content - * @return string */ - private function buildHeader($content) + private function buildHeader(string $content): string { $header = "POST /api/chat.postMessage HTTP/1.1\r\n"; $header .= "Host: slack.com\r\n"; @@ -143,10 +137,8 @@ class SlackHandler extends SocketHandler /** * {@inheritdoc} - * - * @param array $record */ - protected function write(array $record) + protected function write(array $record): void { parent::write($record); $this->finalizeWrite(); @@ -158,7 +150,7 @@ class SlackHandler extends SocketHandler * If we do not read some but close the socket too early, slack sometimes * drops the request entirely. */ - protected function finalizeWrite() + protected function finalizeWrite(): void { $res = $this->getResource(); if (is_resource($res)) { @@ -167,42 +159,7 @@ class SlackHandler extends SocketHandler $this->closeSocket(); } - /** - * Returned a Slack message attachment color associated with - * provided level. - * - * @param int $level - * @return string - * @deprecated Use underlying SlackRecord instead - */ - protected function getAttachmentColor($level) - { - trigger_error( - 'SlackHandler::getAttachmentColor() is deprecated. Use underlying SlackRecord instead.', - E_USER_DEPRECATED - ); - - return $this->slackRecord->getAttachmentColor($level); - } - - /** - * Stringifies an array of key/value pairs to be used in attachment fields - * - * @param array $fields - * @return string - * @deprecated Use underlying SlackRecord instead - */ - protected function stringify($fields) - { - trigger_error( - 'SlackHandler::stringify() is deprecated. Use underlying SlackRecord instead.', - E_USER_DEPRECATED - ); - - return $this->slackRecord->stringify($fields); - } - - public function setFormatter(FormatterInterface $formatter) + public function setFormatter(FormatterInterface $formatter): HandlerInterface { parent::setFormatter($formatter); $this->slackRecord->setFormatter($formatter); @@ -210,11 +167,66 @@ class SlackHandler extends SocketHandler return $this; } - public function getFormatter() + public function getFormatter(): FormatterInterface { $formatter = parent::getFormatter(); $this->slackRecord->setFormatter($formatter); return $formatter; } + + /** + * Channel used by the bot when posting + */ + public function setChannel(string $channel): self + { + $this->slackRecord->setChannel($channel); + + return $this; + } + + /** + * Username used by the bot when posting + */ + public function setUsername(string $username): self + { + $this->slackRecord->setUsername($username); + + return $this; + } + + public function useAttachment(bool $useAttachment): self + { + $this->slackRecord->useAttachment($useAttachment); + + return $this; + } + + public function setIconEmoji(string $iconEmoji): self + { + $this->slackRecord->setUserIcon($iconEmoji); + + return $this; + } + + public function useShortAttachment(bool $useShortAttachment): self + { + $this->slackRecord->useShortAttachment($useShortAttachment); + + return $this; + } + + public function includeContextAndExtra(bool $includeContextAndExtra): self + { + $this->slackRecord->includeContextAndExtra($includeContextAndExtra); + + return $this; + } + + public function excludeFields(array $excludeFields): self + { + $this->slackRecord->excludeFields($excludeFields); + + return $this; + } } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/SlackWebhookHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/SlackWebhookHandler.php index 1ef85fa..9b19a2e 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/SlackWebhookHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/SlackWebhookHandler.php @@ -1,4 +1,4 @@ -webhookUrl = $webhookUrl; @@ -60,17 +70,16 @@ class SlackWebhookHandler extends AbstractProcessingHandler $iconEmoji, $useShortAttachment, $includeContextAndExtra, - $excludeFields, - $this->formatter + $excludeFields ); } - public function getSlackRecord() + public function getSlackRecord(): SlackRecord { return $this->slackRecord; } - public function getWebhookUrl() + public function getWebhookUrl(): string { return $this->webhookUrl; } @@ -80,7 +89,7 @@ class SlackWebhookHandler extends AbstractProcessingHandler * * @param array $record */ - protected function write(array $record) + protected function write(array $record): void { $postData = $this->slackRecord->getSlackData($record); $postString = json_encode($postData); @@ -91,7 +100,7 @@ class SlackWebhookHandler extends AbstractProcessingHandler CURLOPT_POST => true, CURLOPT_RETURNTRANSFER => true, CURLOPT_HTTPHEADER => array('Content-type: application/json'), - CURLOPT_POSTFIELDS => $postString + CURLOPT_POSTFIELDS => $postString, ); if (defined('CURLOPT_SAFE_UPLOAD')) { $options[CURLOPT_SAFE_UPLOAD] = true; @@ -102,7 +111,7 @@ class SlackWebhookHandler extends AbstractProcessingHandler Curl\Util::execute($ch); } - public function setFormatter(FormatterInterface $formatter) + public function setFormatter(FormatterInterface $formatter): HandlerInterface { parent::setFormatter($formatter); $this->slackRecord->setFormatter($formatter); @@ -110,7 +119,7 @@ class SlackWebhookHandler extends AbstractProcessingHandler return $this; } - public function getFormatter() + public function getFormatter(): FormatterInterface { $formatter = parent::getFormatter(); $this->slackRecord->setFormatter($formatter); diff --git a/vendor/monolog/monolog/src/Monolog/Handler/SlackbotHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/SlackbotHandler.php deleted file mode 100644 index baead52..0000000 --- a/vendor/monolog/monolog/src/Monolog/Handler/SlackbotHandler.php +++ /dev/null @@ -1,80 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\Logger; - -/** - * Sends notifications through Slack's Slackbot - * - * @author Haralan Dobrev - * @see https://slack.com/apps/A0F81R8ET-slackbot - */ -class SlackbotHandler extends AbstractProcessingHandler -{ - /** - * The slug of the Slack team - * @var string - */ - private $slackTeam; - - /** - * Slackbot token - * @var string - */ - private $token; - - /** - * Slack channel name - * @var string - */ - private $channel; - - /** - * @param string $slackTeam Slack team slug - * @param string $token Slackbot token - * @param string $channel Slack channel (encoded ID or name) - * @param int $level The minimum logging level at which this handler will be triggered - * @param bool $bubble Whether the messages that are handled can bubble up the stack or not - */ - public function __construct($slackTeam, $token, $channel, $level = Logger::CRITICAL, $bubble = true) - { - parent::__construct($level, $bubble); - - $this->slackTeam = $slackTeam; - $this->token = $token; - $this->channel = $channel; - } - - /** - * {@inheritdoc} - * - * @param array $record - */ - protected function write(array $record) - { - $slackbotUrl = sprintf( - 'https://%s.slack.com/services/hooks/slackbot?token=%s&channel=%s', - $this->slackTeam, - $this->token, - $this->channel - ); - - $ch = curl_init(); - curl_setopt($ch, CURLOPT_URL, $slackbotUrl); - curl_setopt($ch, CURLOPT_POST, true); - curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); - curl_setopt($ch, CURLOPT_POSTFIELDS, $record['message']); - - Curl\Util::execute($ch); - } -} diff --git a/vendor/monolog/monolog/src/Monolog/Handler/SocketHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/SocketHandler.php index db50d97..2861e67 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/SocketHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/SocketHandler.php @@ -1,4 +1,4 @@ -connectionString = $connectionString; @@ -53,7 +57,7 @@ class SocketHandler extends AbstractProcessingHandler * @throws \UnexpectedValueException * @throws \RuntimeException */ - protected function write(array $record) + protected function write(array $record): void { $this->connectIfNotConnected(); $data = $this->generateDataStream($record); @@ -63,7 +67,7 @@ class SocketHandler extends AbstractProcessingHandler /** * We will not close a PersistentSocket instance so it can be reused in other requests. */ - public function close() + public function close(): void { if (!$this->isPersistent()) { $this->closeSocket(); @@ -73,7 +77,7 @@ class SocketHandler extends AbstractProcessingHandler /** * Close socket, if open */ - public function closeSocket() + public function closeSocket(): void { if (is_resource($this->resource)) { fclose($this->resource); @@ -82,39 +86,39 @@ class SocketHandler extends AbstractProcessingHandler } /** - * Set socket connection to nbe persistent. It only has effect before the connection is initiated. - * - * @param bool $persistent + * Set socket connection to be persistent. It only has effect before the connection is initiated. */ - public function setPersistent($persistent) + public function setPersistent(bool $persistent): self { - $this->persistent = (bool) $persistent; + $this->persistent = $persistent; + + return $this; } /** * Set connection timeout. Only has effect before we connect. * - * @param float $seconds - * * @see http://php.net/manual/en/function.fsockopen.php */ - public function setConnectionTimeout($seconds) + public function setConnectionTimeout(float $seconds): self { $this->validateTimeout($seconds); - $this->connectionTimeout = (float) $seconds; + $this->connectionTimeout = $seconds; + + return $this; } /** * Set write timeout. Only has effect before we connect. * - * @param float $seconds - * * @see http://php.net/manual/en/function.stream-set-timeout.php */ - public function setTimeout($seconds) + public function setTimeout(float $seconds): self { $this->validateTimeout($seconds); - $this->timeout = (float) $seconds; + $this->timeout = $seconds; + + return $this; } /** @@ -122,58 +126,52 @@ class SocketHandler extends AbstractProcessingHandler * * @param float $seconds 0 for no timeout */ - public function setWritingTimeout($seconds) + public function setWritingTimeout(float $seconds): self { $this->validateTimeout($seconds); - $this->writingTimeout = (float) $seconds; + $this->writingTimeout = $seconds; + + return $this; } /** * Set chunk size. Only has effect during connection in the writing cycle. - * - * @param float $bytes */ - public function setChunkSize($bytes) + public function setChunkSize(int $bytes): self { $this->chunkSize = $bytes; + + return $this; } /** * Get current connection string - * - * @return string */ - public function getConnectionString() + public function getConnectionString(): string { return $this->connectionString; } /** * Get persistent setting - * - * @return bool */ - public function isPersistent() + public function isPersistent(): bool { return $this->persistent; } /** * Get current connection timeout setting - * - * @return float */ - public function getConnectionTimeout() + public function getConnectionTimeout(): float { return $this->connectionTimeout; } /** * Get current in-transfer timeout - * - * @return float */ - public function getTimeout() + public function getTimeout(): float { return $this->timeout; } @@ -183,17 +181,15 @@ class SocketHandler extends AbstractProcessingHandler * * @return float */ - public function getWritingTimeout() + public function getWritingTimeout(): float { return $this->writingTimeout; } /** * Get current chunk size - * - * @return float */ - public function getChunkSize() + public function getChunkSize(): int { return $this->chunkSize; } @@ -202,10 +198,8 @@ class SocketHandler extends AbstractProcessingHandler * Check to see if the socket is currently available. * * UDP might appear to be connected but might fail when writing. See http://php.net/fsockopen for details. - * - * @return bool */ - public function isConnected() + public function isConnected(): bool { return is_resource($this->resource) && !feof($this->resource); // on TCP - other party can close connection. @@ -237,7 +231,7 @@ class SocketHandler extends AbstractProcessingHandler $seconds = floor($this->timeout); $microseconds = round(($this->timeout - $seconds) * 1e6); - return stream_set_timeout($this->resource, $seconds, $microseconds); + return stream_set_timeout($this->resource, (int) $seconds, (int) $microseconds); } /** @@ -282,7 +276,7 @@ class SocketHandler extends AbstractProcessingHandler $this->connect(); } - protected function generateDataStream($record) + protected function generateDataStream(array $record): string { return (string) $record['formatted']; } @@ -295,14 +289,14 @@ class SocketHandler extends AbstractProcessingHandler return $this->resource; } - private function connect() + private function connect(): void { $this->createSocketResource(); $this->setSocketTimeout(); $this->setStreamChunkSize(); } - private function createSocketResource() + private function createSocketResource(): void { if ($this->isPersistent()) { $resource = $this->pfsockopen(); @@ -315,21 +309,21 @@ class SocketHandler extends AbstractProcessingHandler $this->resource = $resource; } - private function setSocketTimeout() + private function setSocketTimeout(): void { if (!$this->streamSetTimeout()) { throw new \UnexpectedValueException("Failed setting timeout with stream_set_timeout()"); } } - private function setStreamChunkSize() + private function setStreamChunkSize(): void { if ($this->chunkSize && !$this->streamSetChunkSize()) { throw new \UnexpectedValueException("Failed setting chunk size with stream_set_chunk_size()"); } } - private function writeToSocket($data) + private function writeToSocket(string $data): void { $length = strlen($data); $sent = 0; @@ -358,7 +352,7 @@ class SocketHandler extends AbstractProcessingHandler } } - private function writingIsTimedOut($sent) + private function writingIsTimedOut(int $sent): bool { $writingTimeout = (int) floor($this->writingTimeout); if (0 === $writingTimeout) { diff --git a/vendor/monolog/monolog/src/Monolog/Handler/SqsHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/SqsHandler.php new file mode 100644 index 0000000..a98c87b --- /dev/null +++ b/vendor/monolog/monolog/src/Monolog/Handler/SqsHandler.php @@ -0,0 +1,64 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Monolog\Handler; + +use Aws\Sqs\SqsClient; +use Monolog\Logger; +use Monolog\Utils; + +/** + * Writes to any sqs queue. + * + * @author Martijn van Calker + */ +class SqsHandler extends AbstractProcessingHandler +{ + /** 256 KB in bytes - maximum message size in SQS */ + protected const MAX_MESSAGE_SIZE = 262144; + /** 100 KB in bytes - head message size for new error log */ + protected const HEAD_MESSAGE_SIZE = 102400; + + /** @var SqsClient */ + private $client; + /** @var string */ + private $queueUrl; + + public function __construct(SqsClient $sqsClient, string $queueUrl, $level = Logger::DEBUG, bool $bubble = true) + { + parent::__construct($level, $bubble); + + $this->client = $sqsClient; + $this->queueUrl = $queueUrl; + } + + /** + * Writes the record down to the log of the implementing handler. + * + * @param array $record + */ + protected function write(array $record): void + { + if (!isset($record['formatted']) || 'string' !== gettype($record['formatted'])) { + throw new \InvalidArgumentException('SqsHandler accepts only formatted records as a string'); + } + + $messageBody = $record['formatted']; + if (strlen($messageBody) >= static::MAX_MESSAGE_SIZE) { + $messageBody = Utils::substr($messageBody, 0, static::HEAD_MESSAGE_SIZE); + } + + $this->client->sendMessage([ + 'QueueUrl' => $this->queueUrl, + 'MessageBody' => $messageBody, + ]); + } +} diff --git a/vendor/monolog/monolog/src/Monolog/Handler/StreamHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/StreamHandler.php index a35b7e4..0c2f8d1 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/StreamHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/StreamHandler.php @@ -1,4 +1,4 @@ -url && is_resource($this->stream)) { fclose($this->stream); } $this->stream = null; + $this->dirCreated = null; } /** @@ -80,7 +83,7 @@ class StreamHandler extends AbstractProcessingHandler * * @return string|null */ - public function getUrl() + public function getUrl(): ?string { return $this->url; } @@ -88,7 +91,7 @@ class StreamHandler extends AbstractProcessingHandler /** * {@inheritdoc} */ - protected function write(array $record) + protected function write(array $record): void { if (!is_resource($this->stream)) { if (null === $this->url || '' === $this->url) { @@ -96,7 +99,7 @@ class StreamHandler extends AbstractProcessingHandler } $this->createDir(); $this->errorMessage = null; - set_error_handler(array($this, 'customErrorHandler')); + set_error_handler([$this, 'customErrorHandler']); $this->stream = fopen($this->url, 'a'); if ($this->filePermission !== null) { @chmod($this->url, $this->filePermission); @@ -104,6 +107,7 @@ 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)); } } @@ -123,24 +127,21 @@ class StreamHandler extends AbstractProcessingHandler /** * Write to stream * @param resource $stream - * @param array $record + * @param array $record */ - protected function streamWrite($stream, array $record) + protected function streamWrite($stream, array $record): void { fwrite($stream, (string) $record['formatted']); } - private function customErrorHandler($code, $msg) + private function customErrorHandler($code, $msg): bool { $this->errorMessage = preg_replace('{^(fopen|mkdir)\(.*?\): }', '', $msg); + + return true; } - /** - * @param string $stream - * - * @return null|string - */ - private function getDirFromStream($stream) + private function getDirFromStream(string $stream): ?string { $pos = strpos($stream, '://'); if ($pos === false) { @@ -151,10 +152,10 @@ class StreamHandler extends AbstractProcessingHandler return dirname(substr($stream, 7)); } - return; + return null; } - private function createDir() + private function createDir(): void { // Do not try to create dir if it has already been tried. if ($this->dirCreated) { @@ -164,7 +165,7 @@ class StreamHandler extends AbstractProcessingHandler $dir = $this->getDirFromStream($this->url); if (null !== $dir && !is_dir($dir)) { $this->errorMessage = null; - set_error_handler(array($this, 'customErrorHandler')); + set_error_handler([$this, 'customErrorHandler']); $status = mkdir($dir, 0777, true); restore_error_handler(); if (false === $status && !is_dir($dir)) { diff --git a/vendor/monolog/monolog/src/Monolog/Handler/SwiftMailerHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/SwiftMailerHandler.php index ac7b16f..88279d1 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/SwiftMailerHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/SwiftMailerHandler.php @@ -1,4 +1,4 @@ -mailer->send($this->buildMessage($content, $records)); } @@ -51,10 +52,9 @@ class SwiftMailerHandler extends MailHandler /** * Gets the formatter for the Swift_Message subject. * - * @param string $format The format of the subject - * @return FormatterInterface + * @param string $format The format of the subject */ - protected function getSubjectFormatter($format) + protected function getSubjectFormatter(string $format): FormatterInterface { return new LineFormatter($format); } @@ -62,21 +62,21 @@ class SwiftMailerHandler extends MailHandler /** * Creates instance of Swift_Message to be sent * - * @param string $content formatted email body to be sent - * @param array $records Log records that formed the content - * @return \Swift_Message + * @param string $content formatted email body to be sent + * @param array $records Log records that formed the content + * @return Swift_Message */ - protected function buildMessage($content, array $records) + protected function buildMessage(string $content, array $records): Swift_Message { $message = null; - if ($this->messageTemplate instanceof \Swift_Message) { + if ($this->messageTemplate instanceof Swift_Message) { $message = clone $this->messageTemplate; $message->generateId(); } elseif (is_callable($this->messageTemplate)) { $message = call_user_func($this->messageTemplate, $content, $records); } - if (!$message instanceof \Swift_Message) { + if (!$message instanceof Swift_Message) { throw new \InvalidArgumentException('Could not resolve message as instance of Swift_Message or a callable returning it'); } @@ -85,7 +85,12 @@ class SwiftMailerHandler extends MailHandler $message->setSubject($subjectFormatter->format($this->getHighestRecord($records))); } - $message->setBody($content); + $mime = 'text/plain'; + if ($this->isHtmlBody($content)) { + $mime = 'text/html'; + } + + $message->setBody($content, $mime); if (version_compare(Swift::VERSION, '6.0.0', '>=')) { $message->setDate(new \DateTimeImmutable()); } else { @@ -94,18 +99,4 @@ class SwiftMailerHandler extends MailHandler return $message; } - - /** - * BC getter, to be removed in 2.0 - */ - public function __get($name) - { - if ($name === 'message') { - trigger_error('SwiftMailerHandler->message is deprecated, use ->buildMessage() instead to retrieve the message', E_USER_DEPRECATED); - - return $this->buildMessage(null, array()); - } - - throw new \InvalidArgumentException('Invalid property '.$name); - } } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/SyslogHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/SyslogHandler.php index f770c80..20594ce 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/SyslogHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/SyslogHandler.php @@ -1,4 +1,4 @@ -facilities, or a LOG_* facility constant + * @param string|int $level The minimum logging level at which this handler will be triggered + * @param bool $bubble Whether the messages that are handled can bubble up the stack or not + * @param int $logopts Option flags for the openlog() call, defaults to LOG_PID */ - public function __construct($ident, $facility = LOG_USER, $level = Logger::DEBUG, $bubble = true, $logopts = LOG_PID) + public function __construct(string $ident, $facility = LOG_USER, $level = Logger::DEBUG, bool $bubble = true, int $logopts = LOG_PID) { parent::__construct($facility, $level, $bubble); @@ -49,7 +49,7 @@ class SyslogHandler extends AbstractSyslogHandler /** * {@inheritdoc} */ - public function close() + public function close(): void { closelog(); } @@ -57,7 +57,7 @@ class SyslogHandler extends AbstractSyslogHandler /** * {@inheritdoc} */ - protected function write(array $record) + protected function write(array $record): void { if (!openlog($this->ident, $this->logopts, $this->facility)) { throw new \LogicException('Can\'t open syslog for ident "'.$this->ident.'" and facility "'.$this->facility.'"'); diff --git a/vendor/monolog/monolog/src/Monolog/Handler/SyslogUdp/UdpSocket.php b/vendor/monolog/monolog/src/Monolog/Handler/SyslogUdp/UdpSocket.php index 3bff085..c43bc15 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/SyslogUdp/UdpSocket.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/SyslogUdp/UdpSocket.php @@ -1,4 +1,4 @@ -ip = $ip; $this->port = $port; @@ -31,7 +36,7 @@ class UdpSocket $this->send($this->assembleMessage($line, $header)); } - public function close() + public function close(): void { if (is_resource($this->socket)) { socket_close($this->socket); @@ -39,18 +44,18 @@ class UdpSocket } } - protected function send($chunk) + protected function send(string $chunk): void { if (!is_resource($this->socket)) { - throw new \LogicException('The UdpSocket to '.$this->ip.':'.$this->port.' has been closed and can not be written to anymore'); + throw new \RuntimeException('The UdpSocket to '.$this->ip.':'.$this->port.' has been closed and can not be written to anymore'); } socket_sendto($this->socket, $chunk, strlen($chunk), $flags = 0, $this->ip, $this->port); } - protected function assembleMessage($line, $header) + protected function assembleMessage(string $line, string $header): string { - $chunkSize = self::DATAGRAM_MAX_LENGTH - strlen($header); + $chunkSize = static::DATAGRAM_MAX_LENGTH - strlen($header); - return $header . substr($line, 0, $chunkSize); + return $header . Utils::substr($line, 0, $chunkSize); } } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/SyslogUdpHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/SyslogUdpHandler.php index e14b378..c85ef5b 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/SyslogUdpHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/SyslogUdpHandler.php @@ -1,4 +1,4 @@ - + * @author Dominik Kukacka */ class SyslogUdpHandler extends AbstractSyslogHandler { + const RFC3164 = 0; + const RFC5424 = 1; + + private $dateFormats = array( + self::RFC3164 => 'M d H:i:s', + self::RFC5424 => \DateTime::RFC3339, + ); + protected $socket; protected $ident; + protected $rfc; /** - * @param string $host - * @param int $port - * @param mixed $facility - * @param int $level The minimum logging level at which this handler will be triggered - * @param bool $bubble Whether the messages that are handled can bubble up the stack or not - * @param string $ident Program name or tag for each log message. + * @param string $host + * @param int $port + * @param string|int $facility Either one of the names of the keys in $this->facilities, or a LOG_* facility constant + * @param string|int $level The minimum logging level at which this handler will be triggered + * @param bool $bubble Whether the messages that are handled can bubble up the stack or not + * @param string $ident Program name or tag for each log message. + * @param int $rfc RFC to format the message for. */ - public function __construct($host, $port = 514, $facility = LOG_USER, $level = Logger::DEBUG, $bubble = true, $ident = 'php') + public function __construct(string $host, int $port = 514, $facility = LOG_USER, $level = Logger::DEBUG, bool $bubble = true, string $ident = 'php', int $rfc = self::RFC5424) { parent::__construct($facility, $level, $bubble); $this->ident = $ident; + $this->rfc = $rfc; $this->socket = new UdpSocket($host, $port ?: 514); } - protected function write(array $record) + protected function write(array $record): void { $lines = $this->splitMessageIntoLines($record['formatted']); - $header = $this->makeCommonSyslogHeader($this->logLevels[$record['level']]); + $header = $this->makeCommonSyslogHeader($this->logLevels[$record['level']], $record['datetime']); foreach ($lines as $line) { $this->socket->write($line, $header); } } - public function close() + public function close(): void { $this->socket->close(); } - private function splitMessageIntoLines($message) + private function splitMessageIntoLines($message): array { if (is_array($message)) { $message = implode("\n", $message); } - return preg_split('/$\R?^/m', $message, -1, PREG_SPLIT_NO_EMPTY); + return preg_split('/$\R?^/m', (string) $message, -1, PREG_SPLIT_NO_EMPTY); } /** - * Make common syslog header (see rfc5424) + * Make common syslog header (see rfc5424 or rfc3164) */ - protected function makeCommonSyslogHeader($severity) + protected function makeCommonSyslogHeader(int $severity, DateTimeInterface $datetime): string { $priority = $severity + $this->facility; @@ -81,23 +94,32 @@ class SyslogUdpHandler extends AbstractSyslogHandler $hostname = '-'; } - return "<$priority>1 " . - $this->getDateTime() . " " . - $hostname . " " . - $this->ident . " " . - $pid . " - - "; - } + if ($this->rfc === self::RFC3164) { + $datetime->setTimezone(new \DateTimeZone('UTC')); + } + $date = $datetime->format($this->dateFormats[$this->rfc]); - protected function getDateTime() - { - return date(\DateTime::RFC3339); + if ($this->rfc === self::RFC3164) { + return "<$priority>" . + $date . " " . + $hostname . " " . + $this->ident . "[" . $pid . "]: "; + } else { + return "<$priority>1 " . + $date . " " . + $hostname . " " . + $this->ident . " " . + $pid . " - - "; + } } /** * Inject your own socket, mainly used for testing */ - public function setSocket($socket) + public function setSocket(UdpSocket $socket): self { $this->socket = $socket; + + return $this; } } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/TelegramBotHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/TelegramBotHandler.php new file mode 100644 index 0000000..5dae9f5 --- /dev/null +++ b/vendor/monolog/monolog/src/Monolog/Handler/TelegramBotHandler.php @@ -0,0 +1,99 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Monolog\Handler; + +use RuntimeException; +use Monolog\Logger; + +/** + * Handler send logs to Telegram using Telegram Bot API. + * + * How to use: + * 1) Create telegram bot with https://telegram.me/BotFather + * 2) Create a telegram channel where logs will be recorded. + * 3) Add created bot from step 1 to the created channel from step 2. + * + * Use telegram bot API key from step 1 and channel name with '@' prefix from step 2 to create instance of TelegramBotHandler + * + * @link https://core.telegram.org/bots/api + * + * @author Mazur Alexandr + */ +class TelegramBotHandler extends AbstractProcessingHandler +{ + private const BOT_API = 'https://api.telegram.org/bot'; + + /** + * Telegram bot access token provided by BotFather. + * Create telegram bot with https://telegram.me/BotFather and use access token from it. + * @var string + */ + private $apiKey; + + /** + * Telegram channel name. + * Since to start with '@' symbol as prefix. + * @var string + */ + private $channel; + + /** + * @param string $apiKey Telegram bot access token provided by BotFather + * @param string $channel Telegram channel name + * @inheritDoc + */ + public function __construct( + string $apiKey, + string $channel, + $level = Logger::DEBUG, + bool $bubble = true + ) { + parent::__construct($level, $bubble); + + $this->apiKey = $apiKey; + $this->channel = $channel; + $this->level = $level; + $this->bubble = $bubble; + } + + /** + * @inheritDoc + */ + protected function write(array $record): void + { + $this->send($record['formatted']); + } + + /** + * Send request to @link https://api.telegram.org/bot on SendMessage action. + * @param string $message + */ + protected function send(string $message): void + { + $ch = curl_init(); + $url = self::BOT_API . $this->apiKey . '/SendMessage'; + curl_setopt($ch, CURLOPT_URL, $url); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true); + curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query([ + 'text' => $message, + 'chat_id' => $this->channel, + ])); + + $result = Curl\Util::execute($ch); + $result = json_decode($result, true); + + if ($result['ok'] === false) { + throw new RuntimeException('Telegram API error. Description: ' . $result['description']); + } + } +} diff --git a/vendor/monolog/monolog/src/Monolog/Handler/TestHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/TestHandler.php index b6b1343..4260f74 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/TestHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/TestHandler.php @@ -1,4 +1,4 @@ -records = array(); - $this->recordsByLevel = array(); + $this->records = []; + $this->recordsByLevel = []; } - public function hasRecords($level) + public function reset() { - return isset($this->recordsByLevel[$level]); + if (!$this->skipReset) { + $this->clear(); + } + } + + public function setSkipReset(bool $skipReset) + { + $this->skipReset = $skipReset; + } + + /** + * @param string|int $level Logging level value or name + */ + public function hasRecords($level): bool + { + return isset($this->recordsByLevel[Logger::toMonologLevel($level)]); } /** * @param string|array $record Either a message string or an array containing message and optionally context keys that will be checked against all records - * @param int $level Logger::LEVEL constant value + * @param string|int $level Logging level value or name */ - public function hasRecord($record, $level) + public function hasRecord($record, $level): bool { if (is_string($record)) { $record = array('message' => $record); @@ -101,29 +119,37 @@ class TestHandler extends AbstractProcessingHandler if (isset($record['context']) && $rec['context'] !== $record['context']) { return false; } + return true; }, $level); } - public function hasRecordThatContains($message, $level) + /** + * @param string|int $level Logging level value or name + */ + public function hasRecordThatContains(string $message, $level): bool { return $this->hasRecordThatPasses(function ($rec) use ($message) { return strpos($rec['message'], $message) !== false; }, $level); } - public function hasRecordThatMatches($regex, $level) + /** + * @param string|int $level Logging level value or name + */ + public function hasRecordThatMatches(string $regex, $level): bool { return $this->hasRecordThatPasses(function ($rec) use ($regex) { return preg_match($regex, $rec['message']) > 0; }, $level); } - public function hasRecordThatPasses($predicate, $level) + /** + * @param string|int $level Logging level value or name + */ + public function hasRecordThatPasses(callable $predicate, $level) { - if (!is_callable($predicate)) { - throw new \InvalidArgumentException("Expected a callable for hasRecordThatSucceeds"); - } + $level = Logger::toMonologLevel($level); if (!isset($this->recordsByLevel[$level])) { return false; @@ -141,7 +167,7 @@ class TestHandler extends AbstractProcessingHandler /** * {@inheritdoc} */ - protected function write(array $record) + protected function write(array $record): void { $this->recordsByLevel[$record['level']][] = $record; $this->records[] = $record; @@ -155,7 +181,7 @@ class TestHandler extends AbstractProcessingHandler if (method_exists($this, $genericMethod)) { $args[] = $level; - return call_user_func_array(array($this, $genericMethod), $args); + return call_user_func_array([$this, $genericMethod], $args); } } diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/GelfMockMessagePublisher.php b/vendor/monolog/monolog/src/Monolog/Handler/WebRequestRecognizerTrait.php similarity index 52% rename from vendor/monolog/monolog/tests/Monolog/Handler/GelfMockMessagePublisher.php rename to vendor/monolog/monolog/src/Monolog/Handler/WebRequestRecognizerTrait.php index 873d92f..c818352 100644 --- a/vendor/monolog/monolog/tests/Monolog/Handler/GelfMockMessagePublisher.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/WebRequestRecognizerTrait.php @@ -1,4 +1,4 @@ -lastMessage = $message; + return 'cli' !== \PHP_SAPI && 'phpdbg' !== \PHP_SAPI; } - - public $lastMessage = null; } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/WhatFailureGroupHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/WhatFailureGroupHandler.php index 6bc4671..16c3cbb 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/WhatFailureGroupHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/WhatFailureGroupHandler.php @@ -1,4 +1,4 @@ -processors) { - foreach ($this->processors as $processor) { - $record = call_user_func($processor, $record); - } + $record = $this->processRecord($record); } foreach ($this->handlers as $handler) { try { $handler->handle($record); - } catch (\Exception $e) { - // What failure? } catch (\Throwable $e) { // What failure? } @@ -46,14 +42,12 @@ class WhatFailureGroupHandler extends GroupHandler /** * {@inheritdoc} */ - public function handleBatch(array $records) + public function handleBatch(array $records): void { if ($this->processors) { $processed = array(); foreach ($records as $record) { - foreach ($this->processors as $processor) { - $processed[] = call_user_func($processor, $record); - } + $processed[] = $this->processRecord($record); } $records = $processed; } @@ -61,8 +55,6 @@ class WhatFailureGroupHandler extends GroupHandler foreach ($this->handlers as $handler) { try { $handler->handleBatch($records); - } catch (\Exception $e) { - // What failure? } catch (\Throwable $e) { // What failure? } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/ZendMonitorHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/ZendMonitorHandler.php index f22cf21..d664fa8 100644 --- a/vendor/monolog/monolog/src/Monolog/Handler/ZendMonitorHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/ZendMonitorHandler.php @@ -1,4 +1,5 @@ - + * @author Jason Davis */ class ZendMonitorHandler extends AbstractProcessingHandler { @@ -25,70 +28,68 @@ class ZendMonitorHandler extends AbstractProcessingHandler * * @var array */ - protected $levelMap = array( - Logger::DEBUG => 1, - Logger::INFO => 2, - Logger::NOTICE => 3, - Logger::WARNING => 4, - Logger::ERROR => 5, - Logger::CRITICAL => 6, - Logger::ALERT => 7, - Logger::EMERGENCY => 0, - ); + protected $levelMap = []; /** - * Construct - * - * @param int $level - * @param bool $bubble + * @param string|int $level The minimum logging level at which this handler will be triggered. + * @param bool $bubble Whether the messages that are handled can bubble up the stack or not. * @throws MissingExtensionException */ - public function __construct($level = Logger::DEBUG, $bubble = true) + public function __construct($level = Logger::DEBUG, bool $bubble = true) { if (!function_exists('zend_monitor_custom_event')) { - throw new MissingExtensionException('You must have Zend Server installed in order to use this handler'); + throw new MissingExtensionException( + 'You must have Zend Server installed with Zend Monitor enabled in order to use this handler' + ); } + //zend monitor constants are not defined if zend monitor is not enabled. + $this->levelMap = [ + Logger::DEBUG => \ZEND_MONITOR_EVENT_SEVERITY_INFO, + Logger::INFO => \ZEND_MONITOR_EVENT_SEVERITY_INFO, + Logger::NOTICE => \ZEND_MONITOR_EVENT_SEVERITY_INFO, + Logger::WARNING => \ZEND_MONITOR_EVENT_SEVERITY_WARNING, + Logger::ERROR => \ZEND_MONITOR_EVENT_SEVERITY_ERROR, + Logger::CRITICAL => \ZEND_MONITOR_EVENT_SEVERITY_ERROR, + Logger::ALERT => \ZEND_MONITOR_EVENT_SEVERITY_ERROR, + Logger::EMERGENCY => \ZEND_MONITOR_EVENT_SEVERITY_ERROR, + ]; parent::__construct($level, $bubble); } /** * {@inheritdoc} */ - protected function write(array $record) + protected function write(array $record): void { $this->writeZendMonitorCustomEvent( - $this->levelMap[$record['level']], + Logger::getLevelName($record['level']), $record['message'], - $record['formatted'] + $record['formatted'], + $this->levelMap[$record['level']] ); } /** - * Write a record to Zend Monitor - * - * @param int $level - * @param string $message - * @param array $formatted + * Write to Zend Monitor Events + * @param string $type Text displayed in "Class Name (custom)" field + * @param string $message Text displayed in "Error String" + * @param mixed $formatted Displayed in Custom Variables tab + * @param int $severity Set the event severity level (-1,0,1) */ - protected function writeZendMonitorCustomEvent($level, $message, $formatted) + protected function writeZendMonitorCustomEvent(string $type, string $message, array $formatted, int $severity): void { - zend_monitor_custom_event($level, $message, $formatted); + zend_monitor_custom_event($type, $message, $formatted, $severity); } /** * {@inheritdoc} */ - public function getDefaultFormatter() + public function getDefaultFormatter(): FormatterInterface { return new NormalizerFormatter(); } - /** - * Get the level map - * - * @return array - */ - public function getLevelMap() + public function getLevelMap(): array { return $this->levelMap; } diff --git a/vendor/monolog/monolog/src/Monolog/Logger.php b/vendor/monolog/monolog/src/Monolog/Logger.php index 05dfc81..a8e9787 100644 --- a/vendor/monolog/monolog/src/Monolog/Logger.php +++ b/vendor/monolog/monolog/src/Monolog/Logger.php @@ -1,4 +1,4 @@ - 'DEBUG', self::INFO => 'INFO', self::NOTICE => 'NOTICE', @@ -101,12 +101,7 @@ class Logger implements LoggerInterface, ResettableInterface self::CRITICAL => 'CRITICAL', self::ALERT => 'ALERT', self::EMERGENCY => 'EMERGENCY', - ); - - /** - * @var \DateTimeZone - */ - protected static $timezone; + ]; /** * @var string @@ -135,36 +130,38 @@ class Logger implements LoggerInterface, ResettableInterface protected $microsecondTimestamps = true; /** - * @var callable + * @var DateTimeZone + */ + protected $timezone; + + /** + * @var callable|null */ protected $exceptionHandler; /** - * @param string $name The logging channel + * @param string $name The logging channel, a simple descriptive name that is attached to all log records * @param HandlerInterface[] $handlers Optional stack of handlers, the first one in the array is called first, etc. * @param callable[] $processors Optional array of processors + * @param DateTimeZone|null $timezone Optional timezone, if not provided date_default_timezone_get() will be used */ - public function __construct($name, array $handlers = array(), array $processors = array()) + public function __construct(string $name, array $handlers = [], array $processors = [], ?DateTimeZone $timezone = null) { $this->name = $name; $this->setHandlers($handlers); $this->processors = $processors; + $this->timezone = $timezone ?: new DateTimeZone(date_default_timezone_get() ?: 'UTC'); } - /** - * @return string - */ - public function getName() + public function getName(): string { return $this->name; } /** * Return a new cloned instance with the name changed - * - * @return static */ - public function withName($name) + public function withName(string $name): self { $new = clone $this; $new->name = $name; @@ -174,11 +171,8 @@ class Logger implements LoggerInterface, ResettableInterface /** * Pushes a handler on to the stack. - * - * @param HandlerInterface $handler - * @return $this */ - public function pushHandler(HandlerInterface $handler) + public function pushHandler(HandlerInterface $handler): self { array_unshift($this->handlers, $handler); @@ -188,9 +182,9 @@ class Logger implements LoggerInterface, ResettableInterface /** * Pops a handler from the stack * - * @return HandlerInterface + * @throws \LogicException If empty handler stack */ - public function popHandler() + public function popHandler(): HandlerInterface { if (!$this->handlers) { throw new \LogicException('You tried to pop from an empty handler stack.'); @@ -204,12 +198,11 @@ class Logger implements LoggerInterface, ResettableInterface * * If a map is passed, keys will be ignored. * - * @param HandlerInterface[] $handlers - * @return $this + * @param HandlerInterface[] $handlers */ - public function setHandlers(array $handlers) + public function setHandlers(array $handlers): self { - $this->handlers = array(); + $this->handlers = []; foreach (array_reverse($handlers) as $handler) { $this->pushHandler($handler); } @@ -220,22 +213,16 @@ class Logger implements LoggerInterface, ResettableInterface /** * @return HandlerInterface[] */ - public function getHandlers() + public function getHandlers(): array { return $this->handlers; } /** * Adds a processor on to the stack. - * - * @param callable $callback - * @return $this */ - public function pushProcessor($callback) + public function pushProcessor(callable $callback): self { - if (!is_callable($callback)) { - throw new \InvalidArgumentException('Processors must be valid callables (callback or object with an __invoke method), '.var_export($callback, true).' given'); - } array_unshift($this->processors, $callback); return $this; @@ -244,9 +231,10 @@ class Logger implements LoggerInterface, ResettableInterface /** * Removes the processor on top of the stack and returns it. * + * @throws \LogicException If empty processor stack * @return callable */ - public function popProcessor() + public function popProcessor(): callable { if (!$this->processors) { throw new \LogicException('You tried to pop from an empty processor stack.'); @@ -258,7 +246,7 @@ class Logger implements LoggerInterface, ResettableInterface /** * @return callable[] */ - public function getProcessors() + public function getProcessors(): array { return $this->processors; } @@ -267,79 +255,70 @@ class Logger implements LoggerInterface, ResettableInterface * Control the use of microsecond resolution timestamps in the 'datetime' * member of new records. * - * Generating microsecond resolution timestamps by calling + * On PHP7.0, generating microsecond resolution timestamps by calling * microtime(true), formatting the result via sprintf() and then parsing * the resulting string via \DateTime::createFromFormat() can incur * a measurable runtime overhead vs simple usage of DateTime to capture * a second resolution timestamp in systems which generate a large number * of log events. * + * On PHP7.1 however microseconds are always included by the engine, so + * this setting can be left alone unless you really want to suppress + * microseconds in the output. + * * @param bool $micro True to use microtime() to create timestamps */ - public function useMicrosecondTimestamps($micro) + public function useMicrosecondTimestamps(bool $micro) { - $this->microsecondTimestamps = (bool) $micro; + $this->microsecondTimestamps = $micro; } /** * Adds a log record. * - * @param int $level The logging level - * @param string $message The log message - * @param array $context The log context - * @return bool Whether the record has been processed + * @param int $level The logging level + * @param string $message The log message + * @param array $context The log context + * @return bool Whether the record has been processed */ - public function addRecord($level, $message, array $context = array()) + public function addRecord(int $level, string $message, array $context = []): bool { - if (!$this->handlers) { - $this->pushHandler(new StreamHandler('php://stderr', static::DEBUG)); - } - - $levelName = static::getLevelName($level); - // check if any handler will handle this message so we can return early and save cycles $handlerKey = null; - reset($this->handlers); - while ($handler = current($this->handlers)) { - if ($handler->isHandling(array('level' => $level))) { - $handlerKey = key($this->handlers); + foreach ($this->handlers as $key => $handler) { + if ($handler->isHandling(['level' => $level])) { + $handlerKey = $key; break; } - - next($this->handlers); } if (null === $handlerKey) { return false; } - if (!static::$timezone) { - static::$timezone = new \DateTimeZone(date_default_timezone_get() ?: 'UTC'); - } + $levelName = static::getLevelName($level); - // php7.1+ always has microseconds enabled, so we do not need this hack - if ($this->microsecondTimestamps && PHP_VERSION_ID < 70100) { - $ts = \DateTime::createFromFormat('U.u', sprintf('%.6F', microtime(true)), static::$timezone); - } else { - $ts = new \DateTime(null, static::$timezone); - } - $ts->setTimezone(static::$timezone); - - $record = array( - 'message' => (string) $message, + $record = [ + 'message' => $message, 'context' => $context, 'level' => $level, 'level_name' => $levelName, 'channel' => $this->name, - 'datetime' => $ts, - 'extra' => array(), - ); + 'datetime' => new DateTimeImmutable($this->microsecondTimestamps, $this->timezone), + 'extra' => [], + ]; try { foreach ($this->processors as $processor) { $record = call_user_func($processor, $record); } + // advance the array pointer to the first handler that will handle this record + reset($this->handlers); + while ($handlerKey !== key($this->handlers)) { + next($this->handlers); + } + while ($handler = current($this->handlers)) { if (true === $handler->handle($record)) { break; @@ -347,7 +326,7 @@ class Logger implements LoggerInterface, ResettableInterface next($this->handlers); } - } catch (Exception $e) { + } catch (Throwable $e) { $this->handleException($e, $record); } @@ -364,12 +343,10 @@ class Logger implements LoggerInterface, ResettableInterface * This is useful at the end of a request and will be called automatically on every handler * when they get destructed. */ - public function close() + public function close(): void { foreach ($this->handlers as $handler) { - if (method_exists($handler, 'close')) { - $handler->close(); - } + $handler->close(); } } @@ -383,7 +360,7 @@ class Logger implements LoggerInterface, ResettableInterface * have a long running process like a worker or an application server serving multiple requests * in one process. */ - public function reset() + public function reset(): void { foreach ($this->handlers as $handler) { if ($handler instanceof ResettableInterface) { @@ -398,108 +375,12 @@ class Logger implements LoggerInterface, ResettableInterface } } - /** - * Adds a log record at the DEBUG level. - * - * @param string $message The log message - * @param array $context The log context - * @return bool Whether the record has been processed - */ - public function addDebug($message, array $context = array()) - { - return $this->addRecord(static::DEBUG, $message, $context); - } - - /** - * Adds a log record at the INFO level. - * - * @param string $message The log message - * @param array $context The log context - * @return bool Whether the record has been processed - */ - public function addInfo($message, array $context = array()) - { - return $this->addRecord(static::INFO, $message, $context); - } - - /** - * Adds a log record at the NOTICE level. - * - * @param string $message The log message - * @param array $context The log context - * @return bool Whether the record has been processed - */ - public function addNotice($message, array $context = array()) - { - return $this->addRecord(static::NOTICE, $message, $context); - } - - /** - * Adds a log record at the WARNING level. - * - * @param string $message The log message - * @param array $context The log context - * @return bool Whether the record has been processed - */ - public function addWarning($message, array $context = array()) - { - return $this->addRecord(static::WARNING, $message, $context); - } - - /** - * Adds a log record at the ERROR level. - * - * @param string $message The log message - * @param array $context The log context - * @return bool Whether the record has been processed - */ - public function addError($message, array $context = array()) - { - return $this->addRecord(static::ERROR, $message, $context); - } - - /** - * Adds a log record at the CRITICAL level. - * - * @param string $message The log message - * @param array $context The log context - * @return bool Whether the record has been processed - */ - public function addCritical($message, array $context = array()) - { - return $this->addRecord(static::CRITICAL, $message, $context); - } - - /** - * Adds a log record at the ALERT level. - * - * @param string $message The log message - * @param array $context The log context - * @return bool Whether the record has been processed - */ - public function addAlert($message, array $context = array()) - { - return $this->addRecord(static::ALERT, $message, $context); - } - - /** - * Adds a log record at the EMERGENCY level. - * - * @param string $message The log message - * @param array $context The log context - * @return bool Whether the record has been processed - */ - public function addEmergency($message, array $context = array()) - { - return $this->addRecord(static::EMERGENCY, $message, $context); - } - /** * Gets all supported logging levels. * * @return array Assoc array with human-readable level names => level codes. */ - public static function getLevels() + public static function getLevels(): array { return array_flip(static::$levels); } @@ -507,10 +388,9 @@ class Logger implements LoggerInterface, ResettableInterface /** * Gets the name of the logging level. * - * @param int $level - * @return string + * @throws \Psr\Log\InvalidArgumentException If level is not defined */ - public static function getLevelName($level) + public static function getLevelName(int $level): string { if (!isset(static::$levels[$level])) { throw new InvalidArgumentException('Level "'.$level.'" is not defined, use one of: '.implode(', ', array_keys(static::$levels))); @@ -522,13 +402,21 @@ class Logger implements LoggerInterface, ResettableInterface /** * Converts PSR-3 levels to Monolog ones if necessary * - * @param string|int Level number (monolog) or name (PSR-3) - * @return int + * @param string|int $level Level number (monolog) or name (PSR-3) + * @throws \Psr\Log\InvalidArgumentException If level is not defined */ - public static function toMonologLevel($level) + public static function toMonologLevel($level): int { - if (is_string($level) && defined(__CLASS__.'::'.strtoupper($level))) { - return constant(__CLASS__.'::'.strtoupper($level)); + if (is_string($level)) { + if (defined(__CLASS__.'::'.strtoupper($level))) { + return constant(__CLASS__.'::'.strtoupper($level)); + } + + throw new InvalidArgumentException('Level "'.$level.'" is not defined, use one of: '.implode(', ', array_keys(static::$levels))); + } + + if (!is_int($level)) { + throw new InvalidArgumentException('Level "'.var_export($level, true).'" is not defined, use one of: '.implode(', ', array_keys(static::$levels))); } return $level; @@ -536,15 +424,12 @@ class Logger implements LoggerInterface, ResettableInterface /** * Checks whether the Logger has a handler that listens on the given level - * - * @param int $level - * @return bool */ - public function isHandling($level) + public function isHandling(int $level): bool { - $record = array( + $record = [ 'level' => $level, - ); + ]; foreach ($this->handlers as $handler) { if ($handler->isHandling($record)) { @@ -556,57 +441,36 @@ class Logger implements LoggerInterface, ResettableInterface } /** - * Set a custom exception handler + * Set a custom exception handler that will be called if adding a new record fails * - * @param callable $callback - * @return $this + * The callable will receive an exception object and the record that failed to be logged */ - public function setExceptionHandler($callback) + public function setExceptionHandler(?callable $callback): self { - if (!is_callable($callback)) { - throw new \InvalidArgumentException('Exception handler must be valid callable (callback or object with an __invoke method), '.var_export($callback, true).' given'); - } $this->exceptionHandler = $callback; return $this; } - /** - * @return callable - */ - public function getExceptionHandler() + public function getExceptionHandler(): ?callable { return $this->exceptionHandler; } - /** - * Delegates exception management to the custom exception handler, - * or throws the exception if no custom handler is set. - */ - protected function handleException(Exception $e, array $record) - { - if (!$this->exceptionHandler) { - throw $e; - } - - call_user_func($this->exceptionHandler, $e, $record); - } - /** * Adds a log record at an arbitrary level. * * This method allows for compatibility with common interfaces. * - * @param mixed $level The log level - * @param string $message The log message - * @param array $context The log context - * @return bool Whether the record has been processed + * @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()) + public function log($level, $message, array $context = []): void { $level = static::toMonologLevel($level); - return $this->addRecord($level, $message, $context); + $this->addRecord($level, (string) $message, $context); } /** @@ -614,13 +478,12 @@ class Logger implements LoggerInterface, ResettableInterface * * This method allows for compatibility with common interfaces. * - * @param string $message The log message - * @param array $context The log context - * @return bool Whether the record has been processed + * @param string $message The log message + * @param array $context The log context */ - public function debug($message, array $context = array()) + public function debug($message, array $context = []): void { - return $this->addRecord(static::DEBUG, $message, $context); + $this->addRecord(static::DEBUG, (string) $message, $context); } /** @@ -628,13 +491,12 @@ class Logger implements LoggerInterface, ResettableInterface * * This method allows for compatibility with common interfaces. * - * @param string $message The log message - * @param array $context The log context - * @return bool Whether the record has been processed + * @param string $message The log message + * @param array $context The log context */ - public function info($message, array $context = array()) + public function info($message, array $context = []): void { - return $this->addRecord(static::INFO, $message, $context); + $this->addRecord(static::INFO, (string) $message, $context); } /** @@ -642,13 +504,12 @@ class Logger implements LoggerInterface, ResettableInterface * * This method allows for compatibility with common interfaces. * - * @param string $message The log message - * @param array $context The log context - * @return bool Whether the record has been processed + * @param string $message The log message + * @param array $context The log context */ - public function notice($message, array $context = array()) + public function notice($message, array $context = []): void { - return $this->addRecord(static::NOTICE, $message, $context); + $this->addRecord(static::NOTICE, (string) $message, $context); } /** @@ -656,27 +517,12 @@ class Logger implements LoggerInterface, ResettableInterface * * This method allows for compatibility with common interfaces. * - * @param string $message The log message - * @param array $context The log context - * @return bool Whether the record has been processed + * @param string $message The log message + * @param array $context The log context */ - public function warn($message, array $context = array()) + public function warning($message, array $context = []): void { - return $this->addRecord(static::WARNING, $message, $context); - } - - /** - * Adds a log record at the WARNING level. - * - * This method allows for compatibility with common interfaces. - * - * @param string $message The log message - * @param array $context The log context - * @return bool Whether the record has been processed - */ - public function warning($message, array $context = array()) - { - return $this->addRecord(static::WARNING, $message, $context); + $this->addRecord(static::WARNING, (string) $message, $context); } /** @@ -684,27 +530,12 @@ class Logger implements LoggerInterface, ResettableInterface * * This method allows for compatibility with common interfaces. * - * @param string $message The log message - * @param array $context The log context - * @return bool Whether the record has been processed + * @param string $message The log message + * @param array $context The log context */ - public function err($message, array $context = array()) + public function error($message, array $context = []): void { - return $this->addRecord(static::ERROR, $message, $context); - } - - /** - * Adds a log record at the ERROR level. - * - * This method allows for compatibility with common interfaces. - * - * @param string $message The log message - * @param array $context The log context - * @return bool Whether the record has been processed - */ - public function error($message, array $context = array()) - { - return $this->addRecord(static::ERROR, $message, $context); + $this->addRecord(static::ERROR, (string) $message, $context); } /** @@ -712,27 +543,12 @@ class Logger implements LoggerInterface, ResettableInterface * * This method allows for compatibility with common interfaces. * - * @param string $message The log message - * @param array $context The log context - * @return bool Whether the record has been processed + * @param string $message The log message + * @param array $context The log context */ - public function crit($message, array $context = array()) + public function critical($message, array $context = []): void { - return $this->addRecord(static::CRITICAL, $message, $context); - } - - /** - * Adds a log record at the CRITICAL level. - * - * This method allows for compatibility with common interfaces. - * - * @param string $message The log message - * @param array $context The log context - * @return bool Whether the record has been processed - */ - public function critical($message, array $context = array()) - { - return $this->addRecord(static::CRITICAL, $message, $context); + $this->addRecord(static::CRITICAL, (string) $message, $context); } /** @@ -740,13 +556,12 @@ class Logger implements LoggerInterface, ResettableInterface * * This method allows for compatibility with common interfaces. * - * @param string $message The log message - * @param array $context The log context - * @return bool Whether the record has been processed + * @param string $message The log message + * @param array $context The log context */ - public function alert($message, array $context = array()) + public function alert($message, array $context = []): void { - return $this->addRecord(static::ALERT, $message, $context); + $this->addRecord(static::ALERT, (string) $message, $context); } /** @@ -754,38 +569,42 @@ class Logger implements LoggerInterface, ResettableInterface * * This method allows for compatibility with common interfaces. * - * @param string $message The log message - * @param array $context The log context - * @return bool Whether the record has been processed + * @param string $message The log message + * @param array $context The log context */ - public function emerg($message, array $context = array()) + public function emergency($message, array $context = []): void { - return $this->addRecord(static::EMERGENCY, $message, $context); + $this->addRecord(static::EMERGENCY, (string) $message, $context); } /** - * Adds a log record at the EMERGENCY level. - * - * This method allows for compatibility with common interfaces. - * - * @param string $message The log message - * @param array $context The log context - * @return bool Whether the record has been processed + * Sets the timezone to be used for the timestamp of log records. */ - public function emergency($message, array $context = array()) + public function setTimezone(DateTimeZone $tz): self { - return $this->addRecord(static::EMERGENCY, $message, $context); + $this->timezone = $tz; + + return $this; } /** - * Set the timezone to be used for the timestamp of log records. - * - * This is stored globally for all Logger instances - * - * @param \DateTimeZone $tz Timezone object + * Returns the timezone to be used for the timestamp of log records. */ - public static function setTimezone(\DateTimeZone $tz) + public function getTimezone(): DateTimeZone { - self::$timezone = $tz; + return $this->timezone; + } + + /** + * Delegates exception management to the custom exception handler, + * or throws the exception if no custom handler is set. + */ + protected function handleException(Throwable $e, array $record) + { + if (!$this->exceptionHandler) { + throw $e; + } + + call_user_func($this->exceptionHandler, $e, $record); } } diff --git a/vendor/monolog/monolog/src/Monolog/Processor/GitProcessor.php b/vendor/monolog/monolog/src/Monolog/Processor/GitProcessor.php index 9fc3f50..1367ee6 100644 --- a/vendor/monolog/monolog/src/Monolog/Processor/GitProcessor.php +++ b/vendor/monolog/monolog/src/Monolog/Processor/GitProcessor.php @@ -1,4 +1,4 @@ -level = Logger::toMonologLevel($level); } - /** - * @param array $record - * @return array - */ - public function __invoke(array $record) + public function __invoke(array $record): array { // return if the level is not high enough if ($record['level'] < $this->level) { @@ -45,7 +44,7 @@ class GitProcessor implements ProcessorInterface return $record; } - private static function getGitInfo() + private static function getGitInfo(): array { if (self::$cache) { return self::$cache; @@ -53,12 +52,12 @@ class GitProcessor implements ProcessorInterface $branches = `git branch -v --no-abbrev`; if (preg_match('{^\* (.+?)\s+([a-f0-9]{40})(?:\s|$)}m', $branches, $matches)) { - return self::$cache = array( + return self::$cache = [ 'branch' => $matches[1], 'commit' => $matches[2], - ); + ]; } - return self::$cache = array(); + return self::$cache = []; } } diff --git a/vendor/monolog/monolog/src/Monolog/Processor/HostnameProcessor.php b/vendor/monolog/monolog/src/Monolog/Processor/HostnameProcessor.php new file mode 100644 index 0000000..7c23db8 --- /dev/null +++ b/vendor/monolog/monolog/src/Monolog/Processor/HostnameProcessor.php @@ -0,0 +1,32 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Monolog\Processor; + +/** + * Injects value of gethostname in all records + */ +class HostnameProcessor implements ProcessorInterface +{ + private static $host; + + public function __construct() + { + self::$host = (string) gethostname(); + } + + public function __invoke(array $record): array + { + $record['extra']['hostname'] = self::$host; + + return $record; + } +} diff --git a/vendor/monolog/monolog/src/Monolog/Processor/IntrospectionProcessor.php b/vendor/monolog/monolog/src/Monolog/Processor/IntrospectionProcessor.php index 6ae192a..c0cc014 100644 --- a/vendor/monolog/monolog/src/Monolog/Processor/IntrospectionProcessor.php +++ b/vendor/monolog/monolog/src/Monolog/Processor/IntrospectionProcessor.php @@ -1,4 +1,4 @@ -level = Logger::toMonologLevel($level); - $this->skipClassesPartials = array_merge(array('Monolog\\'), $skipClassesPartials); + $this->skipClassesPartials = array_merge(['Monolog\\'], $skipClassesPartials); $this->skipStackFramesCount = $skipStackFramesCount; } - /** - * @param array $record - * @return array - */ - public function __invoke(array $record) + public function __invoke(array $record): array { // return if the level is not high enough if ($record['level'] < $this->level) { return $record; } - /* - * http://php.net/manual/en/function.debug-backtrace.php - * As of 5.3.6, DEBUG_BACKTRACE_IGNORE_ARGS option was added. - * Any version less than 5.3.6 must use the DEBUG_BACKTRACE_IGNORE_ARGS constant value '2'. - */ - $trace = debug_backtrace((PHP_VERSION_ID < 50306) ? 2 : DEBUG_BACKTRACE_IGNORE_ARGS); + $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); // skip first since it's always the current method array_shift($trace); @@ -74,11 +68,13 @@ class IntrospectionProcessor implements ProcessorInterface foreach ($this->skipClassesPartials as $part) { if (strpos($trace[$i]['class'], $part) !== false) { $i++; + continue 2; } } } elseif (in_array($trace[$i]['function'], $this->skipFunctions)) { $i++; + continue; } @@ -90,18 +86,18 @@ class IntrospectionProcessor implements ProcessorInterface // we should have the call source now $record['extra'] = array_merge( $record['extra'], - array( + [ 'file' => isset($trace[$i - 1]['file']) ? $trace[$i - 1]['file'] : null, 'line' => isset($trace[$i - 1]['line']) ? $trace[$i - 1]['line'] : null, 'class' => isset($trace[$i]['class']) ? $trace[$i]['class'] : null, 'function' => isset($trace[$i]['function']) ? $trace[$i]['function'] : null, - ) + ] ); return $record; } - private function isTraceClassOrSkippedFunction(array $trace, $index) + private function isTraceClassOrSkippedFunction(array $trace, int $index) { if (!isset($trace[$index])) { return false; diff --git a/vendor/monolog/monolog/src/Monolog/Processor/MemoryPeakUsageProcessor.php b/vendor/monolog/monolog/src/Monolog/Processor/MemoryPeakUsageProcessor.php index 0543e92..a1eef61 100644 --- a/vendor/monolog/monolog/src/Monolog/Processor/MemoryPeakUsageProcessor.php +++ b/vendor/monolog/monolog/src/Monolog/Processor/MemoryPeakUsageProcessor.php @@ -1,4 +1,4 @@ -realUsage); - $formatted = $this->formatBytes($bytes); + $usage = memory_get_peak_usage($this->realUsage); - $record['extra']['memory_peak_usage'] = $formatted; + if ($this->useFormatting) { + $usage = $this->formatBytes($usage); + } + + $record['extra']['memory_peak_usage'] = $usage; return $record; } diff --git a/vendor/monolog/monolog/src/Monolog/Processor/MemoryProcessor.php b/vendor/monolog/monolog/src/Monolog/Processor/MemoryProcessor.php index 2a379a3..227deb7 100644 --- a/vendor/monolog/monolog/src/Monolog/Processor/MemoryProcessor.php +++ b/vendor/monolog/monolog/src/Monolog/Processor/MemoryProcessor.php @@ -1,4 +1,4 @@ -realUsage = (bool) $realUsage; - $this->useFormatting = (bool) $useFormatting; + $this->realUsage = $realUsage; + $this->useFormatting = $useFormatting; } /** * Formats bytes into a human readable string if $this->useFormatting is true, otherwise return $bytes as is * * @param int $bytes - * @return string|int Formatted string if $this->useFormatting is true, otherwise return $bytes as is + * @return string|int Formatted string if $this->useFormatting is true, otherwise return $bytes as int */ - protected function formatBytes($bytes) + protected function formatBytes(int $bytes) { - $bytes = (int) $bytes; - if (!$this->useFormatting) { return $bytes; } diff --git a/vendor/monolog/monolog/src/Monolog/Processor/MemoryUsageProcessor.php b/vendor/monolog/monolog/src/Monolog/Processor/MemoryUsageProcessor.php index 2783d65..653c76d 100644 --- a/vendor/monolog/monolog/src/Monolog/Processor/MemoryUsageProcessor.php +++ b/vendor/monolog/monolog/src/Monolog/Processor/MemoryUsageProcessor.php @@ -1,4 +1,4 @@ -realUsage); - $formatted = $this->formatBytes($bytes); + $usage = memory_get_usage($this->realUsage); - $record['extra']['memory_usage'] = $formatted; + if ($this->useFormatting) { + $usage = $this->formatBytes($usage); + } + + $record['extra']['memory_usage'] = $usage; return $record; } diff --git a/vendor/monolog/monolog/src/Monolog/Processor/MercurialProcessor.php b/vendor/monolog/monolog/src/Monolog/Processor/MercurialProcessor.php index 2f5b326..d50f713 100644 --- a/vendor/monolog/monolog/src/Monolog/Processor/MercurialProcessor.php +++ b/vendor/monolog/monolog/src/Monolog/Processor/MercurialProcessor.php @@ -1,9 +1,9 @@ - + * (c) Jordi Boggiano * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -23,16 +23,15 @@ class MercurialProcessor implements ProcessorInterface private $level; private static $cache; + /** + * @param string|int $level The minimum logging level at which this Processor will be triggered + */ public function __construct($level = Logger::DEBUG) { $this->level = Logger::toMonologLevel($level); } - /** - * @param array $record - * @return array - */ - public function __invoke(array $record) + public function __invoke(array $record): array { // return if the level is not high enough if ($record['level'] < $this->level) { @@ -44,20 +43,21 @@ class MercurialProcessor implements ProcessorInterface return $record; } - private static function getMercurialInfo() + private static function getMercurialInfo(): array { if (self::$cache) { return self::$cache; } $result = explode(' ', trim(`hg id -nb`)); + if (count($result) >= 3) { - return self::$cache = array( + return self::$cache = [ 'branch' => $result[1], 'revision' => $result[2], - ); + ]; } - return self::$cache = array(); + return self::$cache = []; } } diff --git a/vendor/monolog/monolog/src/Monolog/Processor/ProcessIdProcessor.php b/vendor/monolog/monolog/src/Monolog/Processor/ProcessIdProcessor.php index 66b80fb..7851fff 100644 --- a/vendor/monolog/monolog/src/Monolog/Processor/ProcessIdProcessor.php +++ b/vendor/monolog/monolog/src/Monolog/Processor/ProcessIdProcessor.php @@ -1,4 +1,4 @@ -dateFormat = $dateFormat; + $this->removeUsedContextFields = $removeUsedContextFields; + } + /** * @param array $record * @return array */ - public function __invoke(array $record) + public function __invoke(array $record): array { if (false === strpos($record['message'], '{')) { return $record; } - $replacements = array(); + $replacements = []; foreach ($record['context'] as $key => $val) { + $placeholder = '{' . $key . '}'; + if (strpos($record['message'], $placeholder) === false) { + continue; + } + if (is_null($val) || is_scalar($val) || (is_object($val) && method_exists($val, "__toString"))) { - $replacements['{'.$key.'}'] = $val; + $replacements[$placeholder] = $val; + } elseif ($val instanceof \DateTimeInterface) { + if (!$this->dateFormat && $val instanceof \Monolog\DateTimeImmutable) { + // handle monolog dates using __toString if no specific dateFormat was asked for + // so that it follows the useMicroseconds flag + $replacements[$placeholder] = (string) $val; + } else { + $replacements[$placeholder] = $val->format($this->dateFormat ?: static::SIMPLE_DATE); + } } elseif (is_object($val)) { - $replacements['{'.$key.'}'] = '[object '.Utils::getClass($val).']'; + $replacements[$placeholder] = '[object '.Utils::getClass($val).']'; + } elseif (is_array($val)) { + $replacements[$placeholder] = 'array'.@json_encode($val); } else { - $replacements['{'.$key.'}'] = '['.gettype($val).']'; + $replacements[$placeholder] = '['.gettype($val).']'; + } + + if ($this->removeUsedContextFields) { + unset($record['context'][$key]); } } diff --git a/vendor/monolog/monolog/src/Monolog/Processor/TagProcessor.php b/vendor/monolog/monolog/src/Monolog/Processor/TagProcessor.php index 615a4d9..199760a 100644 --- a/vendor/monolog/monolog/src/Monolog/Processor/TagProcessor.php +++ b/vendor/monolog/monolog/src/Monolog/Processor/TagProcessor.php @@ -1,4 +1,4 @@ -setTags($tags); } - public function addTags(array $tags = array()) + public function addTags(array $tags = []): self { $this->tags = array_merge($this->tags, $tags); + + return $this; } - public function setTags(array $tags = array()) + public function setTags(array $tags = []): self { $this->tags = $tags; + + return $this; } - public function __invoke(array $record) + public function __invoke(array $record): array { $record['extra']['tags'] = $this->tags; diff --git a/vendor/monolog/monolog/src/Monolog/Processor/UidProcessor.php b/vendor/monolog/monolog/src/Monolog/Processor/UidProcessor.php index d1f708c..0c97ab6 100644 --- a/vendor/monolog/monolog/src/Monolog/Processor/UidProcessor.php +++ b/vendor/monolog/monolog/src/Monolog/Processor/UidProcessor.php @@ -1,4 +1,4 @@ - 32 || $length < 1) { + if ($length > 32 || $length < 1) { throw new \InvalidArgumentException('The uid length must be an integer between 1 and 32'); } - $this->uid = $this->generateUid($length); } - public function __invoke(array $record) + public function __invoke(array $record): array { $record['extra']['uid'] = $this->uid; return $record; } - /** - * @return string - */ - public function getUid() + public function getUid(): string { return $this->uid; } @@ -52,8 +48,8 @@ class UidProcessor implements ProcessorInterface, ResettableInterface $this->uid = $this->generateUid(strlen($this->uid)); } - private function generateUid($length) + private function generateUid(int $length): string { - return substr(hash('md5', uniqid('', true)), 0, $length); + return substr(bin2hex(random_bytes((int) ceil($length / 2))), 0, $length); } } diff --git a/vendor/monolog/monolog/src/Monolog/Processor/WebProcessor.php b/vendor/monolog/monolog/src/Monolog/Processor/WebProcessor.php index 684188f..7b95b0e 100644 --- a/vendor/monolog/monolog/src/Monolog/Processor/WebProcessor.php +++ b/vendor/monolog/monolog/src/Monolog/Processor/WebProcessor.php @@ -1,4 +1,4 @@ - 'REQUEST_URI', 'ip' => 'REMOTE_ADDR', 'http_method' => 'REQUEST_METHOD', 'server' => 'SERVER_NAME', 'referrer' => 'HTTP_REFERER', - ); + ]; /** - * @param array|\ArrayAccess $serverData Array or object w/ ArrayAccess that provides access to the $_SERVER data - * @param array|null $extraFields Field names and the related key inside $serverData to be added. If not provided it defaults to: url, ip, http_method, server, referrer + * @param array|\ArrayAccess|null $serverData Array or object w/ ArrayAccess that provides access to the $_SERVER data + * @param array|null $extraFields Field names and the related key inside $serverData to be added. If not provided it defaults to: url, ip, http_method, server, referrer */ public function __construct($serverData = null, array $extraFields = null) { @@ -65,11 +65,7 @@ class WebProcessor implements ProcessorInterface } } - /** - * @param array $record - * @return array - */ - public function __invoke(array $record) + public function __invoke(array $record): array { // skip processing if for some reason request data // is not present (CLI or wonky SAPIs) @@ -82,26 +78,17 @@ class WebProcessor implements ProcessorInterface return $record; } - /** - * @param string $extraName - * @param string $serverName - * @return $this - */ - public function addExtraField($extraName, $serverName) + public function addExtraField(string $extraName, string $serverName): self { $this->extraFields[$extraName] = $serverName; return $this; } - /** - * @param array $extra - * @return array - */ - private function appendExtraFields(array $extra) + private function appendExtraFields(array $extra): array { foreach ($this->extraFields as $extraName => $serverName) { - $extra[$extraName] = isset($this->serverData[$serverName]) ? $this->serverData[$serverName] : null; + $extra[$extraName] = $this->serverData[$serverName] ?? null; } if (isset($this->serverData['UNIQUE_ID'])) { diff --git a/vendor/monolog/monolog/src/Monolog/Registry.php b/vendor/monolog/monolog/src/Monolog/Registry.php index 159b751..78fb97e 100644 --- a/vendor/monolog/monolog/src/Monolog/Registry.php +++ b/vendor/monolog/monolog/src/Monolog/Registry.php @@ -1,4 +1,4 @@ -addError('Sent to $api Logger instance'); - * Monolog\Registry::application()->addError('Sent to $application Logger instance'); + * Monolog\Registry::api()->error('Sent to $api Logger instance'); + * Monolog\Registry::application()->error('Sent to $application Logger instance'); * } * * @@ -42,7 +42,7 @@ class Registry * * @var Logger[] */ - private static $loggers = array(); + private static $loggers = []; /** * Adds new logging channel to the registry @@ -52,7 +52,7 @@ class Registry * @param bool $overwrite Overwrite instance in the registry if the given name already exists? * @throws \InvalidArgumentException If $overwrite set to false and named Logger instance already exists */ - public static function addLogger(Logger $logger, $name = null, $overwrite = false) + public static function addLogger(Logger $logger, ?string $name = null, bool $overwrite = false) { $name = $name ?: $logger->getName(); @@ -68,15 +68,15 @@ class Registry * * @param string|Logger $logger Name or logger instance */ - public static function hasLogger($logger) + public static function hasLogger($logger): bool { if ($logger instanceof Logger) { $index = array_search($logger, self::$loggers, true); return false !== $index; - } else { - return isset(self::$loggers[$logger]); } + + return isset(self::$loggers[$logger]); } /** @@ -84,7 +84,7 @@ class Registry * * @param string|Logger $logger Name or logger instance */ - public static function removeLogger($logger) + public static function removeLogger($logger): void { if ($logger instanceof Logger) { if (false !== ($idx = array_search($logger, self::$loggers, true))) { @@ -98,9 +98,9 @@ class Registry /** * Clears the registry */ - public static function clear() + public static function clear(): void { - self::$loggers = array(); + self::$loggers = []; } /** @@ -108,9 +108,8 @@ class Registry * * @param string $name Name of the requested Logger instance * @throws \InvalidArgumentException If named Logger instance is not in the registry - * @return Logger Requested instance of Logger */ - public static function getInstance($name) + public static function getInstance($name): Logger { if (!isset(self::$loggers[$name])) { throw new InvalidArgumentException(sprintf('Requested "%s" logger instance is not in the registry', $name)); diff --git a/vendor/monolog/monolog/src/Monolog/ResettableInterface.php b/vendor/monolog/monolog/src/Monolog/ResettableInterface.php index 635bc77..2c5fd78 100644 --- a/vendor/monolog/monolog/src/Monolog/ResettableInterface.php +++ b/vendor/monolog/monolog/src/Monolog/ResettableInterface.php @@ -1,4 +1,4 @@ -logger = $logger; } - public function registerSignalHandler($signo, $level = LogLevel::CRITICAL, $callPrevious = true, $restartSyscalls = true, $async = true) + public function registerSignalHandler($signo, $level = LogLevel::CRITICAL, bool $callPrevious = true, bool $restartSyscalls = true, ?bool $async = true): self { if (!extension_loaded('pcntl') || !function_exists('pcntl_signal')) { return $this; } if ($callPrevious) { - if (function_exists('pcntl_signal_get_handler')) { - $handler = pcntl_signal_get_handler($signo); - if ($handler === false) { - return $this; - } - $this->previousSignalHandler[$signo] = $handler; - } else { - $this->previousSignalHandler[$signo] = true; + $handler = pcntl_signal_get_handler($signo); + if ($handler === false) { + return $this; } + $this->previousSignalHandler[$signo] = $handler; } else { unset($this->previousSignalHandler[$signo]); } $this->signalLevelMap[$signo] = $level; $this->signalRestartSyscalls[$signo] = $restartSyscalls; - if (function_exists('pcntl_async_signals') && $async !== null) { + if ($async !== null) { pcntl_async_signals($async); } - pcntl_signal($signo, array($this, 'handleSignal'), $restartSyscalls); + pcntl_signal($signo, [$this, 'handleSignal'], $restartSyscalls); return $this; } - public function handleSignal($signo, array $siginfo = null) + public function handleSignal($signo, array $siginfo = null): void { - static $signals = array(); + static $signals = []; if (!$signals && extension_loaded('pcntl')) { $pcntl = new ReflectionExtension('pcntl'); - $constants = $pcntl->getConstants(); - if (!$constants) { - // HHVM 3.24.2 returns an empty array. - $constants = get_defined_constants(true); - $constants = $constants['Core']; - } - foreach ($constants as $name => $value) { + // HHVM 3.24.2 returns an empty array. + foreach ($pcntl->getConstants() ?: get_defined_constants(true)['Core'] as $name => $value) { if (substr($name, 0, 3) === 'SIG' && $name[3] !== '_' && is_int($value)) { $signals[$value] = $name; } } - unset($constants); } - $level = isset($this->signalLevelMap[$signo]) ? $this->signalLevelMap[$signo] : LogLevel::CRITICAL; - $signal = isset($signals[$signo]) ? $signals[$signo] : $signo; - $context = isset($siginfo) ? $siginfo : array(); + $level = $this->signalLevelMap[$signo] ?? LogLevel::CRITICAL; + $signal = $signals[$signo] ?? $signo; + $context = $siginfo ?? []; $this->logger->log($level, sprintf('Program received signal %s', $signal), $context); if (!isset($this->previousSignalHandler[$signo])) { @@ -95,21 +85,18 @@ class SignalHandler if ($this->previousSignalHandler[$signo] === true || $this->previousSignalHandler[$signo] === SIG_DFL) { if (extension_loaded('pcntl') && function_exists('pcntl_signal') && function_exists('pcntl_sigprocmask') && function_exists('pcntl_signal_dispatch') - && extension_loaded('posix') && function_exists('posix_getpid') && function_exists('posix_kill')) { - $restartSyscalls = isset($this->restartSyscalls[$signo]) ? $this->restartSyscalls[$signo] : true; - pcntl_signal($signo, SIG_DFL, $restartSyscalls); - pcntl_sigprocmask(SIG_UNBLOCK, array($signo), $oldset); - posix_kill(posix_getpid(), $signo); - pcntl_signal_dispatch(); - pcntl_sigprocmask(SIG_SETMASK, $oldset); - pcntl_signal($signo, array($this, 'handleSignal'), $restartSyscalls); - } - } elseif (is_callable($this->previousSignalHandler[$signo])) { - if (PHP_VERSION_ID >= 70100) { - $this->previousSignalHandler[$signo]($signo, $siginfo); - } else { - $this->previousSignalHandler[$signo]($signo); + && extension_loaded('posix') && function_exists('posix_getpid') && function_exists('posix_kill') + ) { + $restartSyscalls = $this->signalRestartSyscalls[$signo] ?? true; + pcntl_signal($signo, SIG_DFL, $restartSyscalls); + pcntl_sigprocmask(SIG_UNBLOCK, [$signo], $oldset); + posix_kill(posix_getpid(), $signo); + pcntl_signal_dispatch(); + pcntl_sigprocmask(SIG_SETMASK, $oldset); + pcntl_signal($signo, [$this, 'handleSignal'], $restartSyscalls); } + } elseif (is_callable($this->previousSignalHandler[$signo])) { + $this->previousSignalHandler[$signo]($signo, $siginfo); } } } diff --git a/vendor/monolog/monolog/tests/Monolog/TestCase.php b/vendor/monolog/monolog/src/Monolog/Test/TestCase.php similarity index 51% rename from vendor/monolog/monolog/tests/Monolog/TestCase.php rename to vendor/monolog/monolog/src/Monolog/Test/TestCase.php index 4eb7b4c..ecb8907 100644 --- a/vendor/monolog/monolog/tests/Monolog/TestCase.php +++ b/vendor/monolog/monolog/src/Monolog/Test/TestCase.php @@ -1,4 +1,4 @@ - + */ +class TestCase extends \PHPUnit\Framework\TestCase { /** * @return array Record */ - protected function getRecord($level = Logger::WARNING, $message = 'test', $context = array()) + protected function getRecord($level = Logger::WARNING, $message = 'test', array $context = []): array { - return array( - 'message' => $message, + return [ + 'message' => (string) $message, 'context' => $context, 'level' => $level, 'level_name' => Logger::getLevelName($level), 'channel' => 'test', - 'datetime' => \DateTime::createFromFormat('U.u', sprintf('%.6F', microtime(true))), - 'extra' => array(), - ); + 'datetime' => new DateTimeImmutable(true), + 'extra' => [], + ]; } - /** - * @return array - */ - protected function getMultipleRecords() + protected function getMultipleRecords(): array { - return array( + return [ $this->getRecord(Logger::DEBUG, 'debug message 1'), $this->getRecord(Logger::DEBUG, 'debug message 2'), $this->getRecord(Logger::INFO, 'information'), $this->getRecord(Logger::WARNING, 'warning'), $this->getRecord(Logger::ERROR, 'error'), - ); + ]; } /** - * @return Monolog\Formatter\FormatterInterface + * @suppress PhanTypeMismatchReturn */ - protected function getIdentityFormatter() + protected function getIdentityFormatter(): FormatterInterface { - $formatter = $this->getMock('Monolog\\Formatter\\FormatterInterface'); + $formatter = $this->createMock(FormatterInterface::class); $formatter->expects($this->any()) ->method('format') - ->will($this->returnCallback(function ($record) { return $record['message']; })); + ->will($this->returnCallback(function ($record) { + return $record['message']; + })); return $formatter; } diff --git a/vendor/monolog/monolog/src/Monolog/Utils.php b/vendor/monolog/monolog/src/Monolog/Utils.php index eb9be86..c389042 100644 --- a/vendor/monolog/monolog/src/Monolog/Utils.php +++ b/vendor/monolog/monolog/src/Monolog/Utils.php @@ -1,4 +1,4 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog; - -use Monolog\Handler\TestHandler; - -class ErrorHandlerTest extends \PHPUnit_Framework_TestCase -{ - public function testHandleError() - { - $logger = new Logger('test', array($handler = new TestHandler)); - $errHandler = new ErrorHandler($logger); - - $errHandler->registerErrorHandler(array(E_USER_NOTICE => Logger::EMERGENCY), false); - trigger_error('Foo', E_USER_ERROR); - $this->assertCount(1, $handler->getRecords()); - $this->assertTrue($handler->hasErrorRecords()); - trigger_error('Foo', E_USER_NOTICE); - $this->assertCount(2, $handler->getRecords()); - $this->assertTrue($handler->hasEmergencyRecords()); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Formatter/ChromePHPFormatterTest.php b/vendor/monolog/monolog/tests/Monolog/Formatter/ChromePHPFormatterTest.php deleted file mode 100644 index 71c4204..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Formatter/ChromePHPFormatterTest.php +++ /dev/null @@ -1,158 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Formatter; - -use Monolog\Logger; - -class ChromePHPFormatterTest extends \PHPUnit_Framework_TestCase -{ - /** - * @covers Monolog\Formatter\ChromePHPFormatter::format - */ - public function testDefaultFormat() - { - $formatter = new ChromePHPFormatter(); - $record = array( - 'level' => Logger::ERROR, - 'level_name' => 'ERROR', - 'channel' => 'meh', - 'context' => array('from' => 'logger'), - 'datetime' => new \DateTime("@0"), - 'extra' => array('ip' => '127.0.0.1'), - 'message' => 'log', - ); - - $message = $formatter->format($record); - - $this->assertEquals( - array( - 'meh', - array( - 'message' => 'log', - 'context' => array('from' => 'logger'), - 'extra' => array('ip' => '127.0.0.1'), - ), - 'unknown', - 'error', - ), - $message - ); - } - - /** - * @covers Monolog\Formatter\ChromePHPFormatter::format - */ - public function testFormatWithFileAndLine() - { - $formatter = new ChromePHPFormatter(); - $record = array( - 'level' => Logger::CRITICAL, - 'level_name' => 'CRITICAL', - 'channel' => 'meh', - 'context' => array('from' => 'logger'), - 'datetime' => new \DateTime("@0"), - 'extra' => array('ip' => '127.0.0.1', 'file' => 'test', 'line' => 14), - 'message' => 'log', - ); - - $message = $formatter->format($record); - - $this->assertEquals( - array( - 'meh', - array( - 'message' => 'log', - 'context' => array('from' => 'logger'), - 'extra' => array('ip' => '127.0.0.1'), - ), - 'test : 14', - 'error', - ), - $message - ); - } - - /** - * @covers Monolog\Formatter\ChromePHPFormatter::format - */ - public function testFormatWithoutContext() - { - $formatter = new ChromePHPFormatter(); - $record = array( - 'level' => Logger::DEBUG, - 'level_name' => 'DEBUG', - 'channel' => 'meh', - 'context' => array(), - 'datetime' => new \DateTime("@0"), - 'extra' => array(), - 'message' => 'log', - ); - - $message = $formatter->format($record); - - $this->assertEquals( - array( - 'meh', - 'log', - 'unknown', - 'log', - ), - $message - ); - } - - /** - * @covers Monolog\Formatter\ChromePHPFormatter::formatBatch - */ - public function testBatchFormatThrowException() - { - $formatter = new ChromePHPFormatter(); - $records = array( - array( - 'level' => Logger::INFO, - 'level_name' => 'INFO', - 'channel' => 'meh', - 'context' => array(), - 'datetime' => new \DateTime("@0"), - 'extra' => array(), - 'message' => 'log', - ), - array( - 'level' => Logger::WARNING, - 'level_name' => 'WARNING', - 'channel' => 'foo', - 'context' => array(), - 'datetime' => new \DateTime("@0"), - 'extra' => array(), - 'message' => 'log2', - ), - ); - - $this->assertEquals( - array( - array( - 'meh', - 'log', - 'unknown', - 'info', - ), - array( - 'foo', - 'log2', - 'unknown', - 'warn', - ), - ), - $formatter->formatBatch($records) - ); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Formatter/ElasticaFormatterTest.php b/vendor/monolog/monolog/tests/Monolog/Formatter/ElasticaFormatterTest.php deleted file mode 100644 index 90cc48d..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Formatter/ElasticaFormatterTest.php +++ /dev/null @@ -1,79 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Formatter; - -use Monolog\Logger; - -class ElasticaFormatterTest extends \PHPUnit_Framework_TestCase -{ - public function setUp() - { - if (!class_exists("Elastica\Document")) { - $this->markTestSkipped("ruflin/elastica not installed"); - } - } - - /** - * @covers Monolog\Formatter\ElasticaFormatter::__construct - * @covers Monolog\Formatter\ElasticaFormatter::format - * @covers Monolog\Formatter\ElasticaFormatter::getDocument - */ - public function testFormat() - { - // test log message - $msg = array( - 'level' => Logger::ERROR, - 'level_name' => 'ERROR', - 'channel' => 'meh', - 'context' => array('foo' => 7, 'bar', 'class' => new \stdClass), - 'datetime' => new \DateTime("@0"), - 'extra' => array(), - 'message' => 'log', - ); - - // expected values - $expected = $msg; - $expected['datetime'] = '1970-01-01T00:00:00.000000+00:00'; - $expected['context'] = array( - 'class' => '[object] (stdClass: {})', - 'foo' => 7, - 0 => 'bar', - ); - - // format log message - $formatter = new ElasticaFormatter('my_index', 'doc_type'); - $doc = $formatter->format($msg); - $this->assertInstanceOf('Elastica\Document', $doc); - - // Document parameters - $params = $doc->getParams(); - $this->assertEquals('my_index', $params['_index']); - $this->assertEquals('doc_type', $params['_type']); - - // Document data values - $data = $doc->getData(); - foreach (array_keys($expected) as $key) { - $this->assertEquals($expected[$key], $data[$key]); - } - } - - /** - * @covers Monolog\Formatter\ElasticaFormatter::getIndex - * @covers Monolog\Formatter\ElasticaFormatter::getType - */ - public function testGetters() - { - $formatter = new ElasticaFormatter('my_index', 'doc_type'); - $this->assertEquals('my_index', $formatter->getIndex()); - $this->assertEquals('doc_type', $formatter->getType()); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Formatter/FlowdockFormatterTest.php b/vendor/monolog/monolog/tests/Monolog/Formatter/FlowdockFormatterTest.php deleted file mode 100644 index 1b2fd97..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Formatter/FlowdockFormatterTest.php +++ /dev/null @@ -1,55 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Formatter; - -use Monolog\Logger; -use Monolog\TestCase; - -class FlowdockFormatterTest extends TestCase -{ - /** - * @covers Monolog\Formatter\FlowdockFormatter::format - */ - public function testFormat() - { - $formatter = new FlowdockFormatter('test_source', 'source@test.com'); - $record = $this->getRecord(); - - $expected = array( - 'source' => 'test_source', - 'from_address' => 'source@test.com', - 'subject' => 'in test_source: WARNING - test', - 'content' => 'test', - 'tags' => array('#logs', '#warning', '#test'), - 'project' => 'test_source', - ); - $formatted = $formatter->format($record); - - $this->assertEquals($expected, $formatted['flowdock']); - } - - /** - * @ covers Monolog\Formatter\FlowdockFormatter::formatBatch - */ - public function testFormatBatch() - { - $formatter = new FlowdockFormatter('test_source', 'source@test.com'); - $records = array( - $this->getRecord(Logger::WARNING), - $this->getRecord(Logger::DEBUG), - ); - $formatted = $formatter->formatBatch($records); - - $this->assertArrayHasKey('flowdock', $formatted[0]); - $this->assertArrayHasKey('flowdock', $formatted[1]); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Formatter/FluentdFormatterTest.php b/vendor/monolog/monolog/tests/Monolog/Formatter/FluentdFormatterTest.php deleted file mode 100644 index fd36dbc..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Formatter/FluentdFormatterTest.php +++ /dev/null @@ -1,62 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Formatter; - -use Monolog\Logger; -use Monolog\TestCase; - -class FluentdFormatterTest extends TestCase -{ - /** - * @covers Monolog\Formatter\FluentdFormatter::__construct - * @covers Monolog\Formatter\FluentdFormatter::isUsingLevelsInTag - */ - public function testConstruct() - { - $formatter = new FluentdFormatter(); - $this->assertEquals(false, $formatter->isUsingLevelsInTag()); - $formatter = new FluentdFormatter(false); - $this->assertEquals(false, $formatter->isUsingLevelsInTag()); - $formatter = new FluentdFormatter(true); - $this->assertEquals(true, $formatter->isUsingLevelsInTag()); - } - - /** - * @covers Monolog\Formatter\FluentdFormatter::format - */ - public function testFormat() - { - $record = $this->getRecord(Logger::WARNING); - $record['datetime'] = new \DateTime("@0"); - - $formatter = new FluentdFormatter(); - $this->assertEquals( - '["test",0,{"message":"test","context":[],"extra":[],"level":300,"level_name":"WARNING"}]', - $formatter->format($record) - ); - } - - /** - * @covers Monolog\Formatter\FluentdFormatter::format - */ - public function testFormatWithTag() - { - $record = $this->getRecord(Logger::ERROR); - $record['datetime'] = new \DateTime("@0"); - - $formatter = new FluentdFormatter(true); - $this->assertEquals( - '["test.error",0,{"message":"test","context":[],"extra":[]}]', - $formatter->format($record) - ); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Formatter/GelfMessageFormatterTest.php b/vendor/monolog/monolog/tests/Monolog/Formatter/GelfMessageFormatterTest.php deleted file mode 100644 index 4a24761..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Formatter/GelfMessageFormatterTest.php +++ /dev/null @@ -1,258 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Formatter; - -use Monolog\Logger; - -class GelfMessageFormatterTest extends \PHPUnit_Framework_TestCase -{ - public function setUp() - { - if (!class_exists('\Gelf\Message')) { - $this->markTestSkipped("graylog2/gelf-php or mlehner/gelf-php is not installed"); - } - } - - /** - * @covers Monolog\Formatter\GelfMessageFormatter::format - */ - public function testDefaultFormatter() - { - $formatter = new GelfMessageFormatter(); - $record = array( - 'level' => Logger::ERROR, - 'level_name' => 'ERROR', - 'channel' => 'meh', - 'context' => array(), - 'datetime' => new \DateTime("@0"), - 'extra' => array(), - 'message' => 'log', - ); - - $message = $formatter->format($record); - - $this->assertInstanceOf('Gelf\Message', $message); - $this->assertEquals(0, $message->getTimestamp()); - $this->assertEquals('log', $message->getShortMessage()); - $this->assertEquals('meh', $message->getFacility()); - $this->assertEquals(null, $message->getLine()); - $this->assertEquals(null, $message->getFile()); - $this->assertEquals($this->isLegacy() ? 3 : 'error', $message->getLevel()); - $this->assertNotEmpty($message->getHost()); - - $formatter = new GelfMessageFormatter('mysystem'); - - $message = $formatter->format($record); - - $this->assertInstanceOf('Gelf\Message', $message); - $this->assertEquals('mysystem', $message->getHost()); - } - - /** - * @covers Monolog\Formatter\GelfMessageFormatter::format - */ - public function testFormatWithFileAndLine() - { - $formatter = new GelfMessageFormatter(); - $record = array( - 'level' => Logger::ERROR, - 'level_name' => 'ERROR', - 'channel' => 'meh', - 'context' => array('from' => 'logger'), - 'datetime' => new \DateTime("@0"), - 'extra' => array('file' => 'test', 'line' => 14), - 'message' => 'log', - ); - - $message = $formatter->format($record); - - $this->assertInstanceOf('Gelf\Message', $message); - $this->assertEquals('test', $message->getFile()); - $this->assertEquals(14, $message->getLine()); - } - - /** - * @covers Monolog\Formatter\GelfMessageFormatter::format - * @expectedException InvalidArgumentException - */ - public function testFormatInvalidFails() - { - $formatter = new GelfMessageFormatter(); - $record = array( - 'level' => Logger::ERROR, - 'level_name' => 'ERROR', - ); - - $formatter->format($record); - } - - /** - * @covers Monolog\Formatter\GelfMessageFormatter::format - */ - public function testFormatWithContext() - { - $formatter = new GelfMessageFormatter(); - $record = array( - 'level' => Logger::ERROR, - 'level_name' => 'ERROR', - 'channel' => 'meh', - 'context' => array('from' => 'logger'), - 'datetime' => new \DateTime("@0"), - 'extra' => array('key' => 'pair'), - 'message' => 'log', - ); - - $message = $formatter->format($record); - - $this->assertInstanceOf('Gelf\Message', $message); - - $message_array = $message->toArray(); - - $this->assertArrayHasKey('_ctxt_from', $message_array); - $this->assertEquals('logger', $message_array['_ctxt_from']); - - // Test with extraPrefix - $formatter = new GelfMessageFormatter(null, null, 'CTX'); - $message = $formatter->format($record); - - $this->assertInstanceOf('Gelf\Message', $message); - - $message_array = $message->toArray(); - - $this->assertArrayHasKey('_CTXfrom', $message_array); - $this->assertEquals('logger', $message_array['_CTXfrom']); - } - - /** - * @covers Monolog\Formatter\GelfMessageFormatter::format - */ - public function testFormatWithContextContainingException() - { - $formatter = new GelfMessageFormatter(); - $record = array( - 'level' => Logger::ERROR, - 'level_name' => 'ERROR', - 'channel' => 'meh', - 'context' => array('from' => 'logger', 'exception' => array( - 'class' => '\Exception', - 'file' => '/some/file/in/dir.php:56', - 'trace' => array('/some/file/1.php:23', '/some/file/2.php:3'), - )), - 'datetime' => new \DateTime("@0"), - 'extra' => array(), - 'message' => 'log', - ); - - $message = $formatter->format($record); - - $this->assertInstanceOf('Gelf\Message', $message); - - $this->assertEquals("/some/file/in/dir.php", $message->getFile()); - $this->assertEquals("56", $message->getLine()); - } - - /** - * @covers Monolog\Formatter\GelfMessageFormatter::format - */ - public function testFormatWithExtra() - { - $formatter = new GelfMessageFormatter(); - $record = array( - 'level' => Logger::ERROR, - 'level_name' => 'ERROR', - 'channel' => 'meh', - 'context' => array('from' => 'logger'), - 'datetime' => new \DateTime("@0"), - 'extra' => array('key' => 'pair'), - 'message' => 'log', - ); - - $message = $formatter->format($record); - - $this->assertInstanceOf('Gelf\Message', $message); - - $message_array = $message->toArray(); - - $this->assertArrayHasKey('_key', $message_array); - $this->assertEquals('pair', $message_array['_key']); - - // Test with extraPrefix - $formatter = new GelfMessageFormatter(null, 'EXT'); - $message = $formatter->format($record); - - $this->assertInstanceOf('Gelf\Message', $message); - - $message_array = $message->toArray(); - - $this->assertArrayHasKey('_EXTkey', $message_array); - $this->assertEquals('pair', $message_array['_EXTkey']); - } - - public function testFormatWithLargeData() - { - $formatter = new GelfMessageFormatter(); - $record = array( - 'level' => Logger::ERROR, - 'level_name' => 'ERROR', - 'channel' => 'meh', - 'context' => array('exception' => str_repeat(' ', 32767)), - 'datetime' => new \DateTime("@0"), - 'extra' => array('key' => str_repeat(' ', 32767)), - 'message' => 'log' - ); - $message = $formatter->format($record); - $messageArray = $message->toArray(); - - // 200 for padding + metadata - $length = 200; - - foreach ($messageArray as $key => $value) { - if (!in_array($key, array('level', 'timestamp'))) { - $length += strlen($value); - } - } - - $this->assertLessThanOrEqual(65792, $length, 'The message length is no longer than the maximum allowed length'); - } - - public function testFormatWithUnlimitedLength() - { - $formatter = new GelfMessageFormatter('LONG_SYSTEM_NAME', null, 'ctxt_', PHP_INT_MAX); - $record = array( - 'level' => Logger::ERROR, - 'level_name' => 'ERROR', - 'channel' => 'meh', - 'context' => array('exception' => str_repeat(' ', 32767 * 2)), - 'datetime' => new \DateTime("@0"), - 'extra' => array('key' => str_repeat(' ', 32767 * 2)), - 'message' => 'log' - ); - $message = $formatter->format($record); - $messageArray = $message->toArray(); - - // 200 for padding + metadata - $length = 200; - - foreach ($messageArray as $key => $value) { - if (!in_array($key, array('level', 'timestamp'))) { - $length += strlen($value); - } - } - - $this->assertGreaterThanOrEqual(131289, $length, 'The message should not be truncated'); - } - - private function isLegacy() - { - return interface_exists('\Gelf\IMessagePublisher'); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Formatter/JsonFormatterTest.php b/vendor/monolog/monolog/tests/Monolog/Formatter/JsonFormatterTest.php deleted file mode 100644 index 24b06cc..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Formatter/JsonFormatterTest.php +++ /dev/null @@ -1,219 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Formatter; - -use Monolog\Logger; -use Monolog\TestCase; - -class JsonFormatterTest extends TestCase -{ - /** - * @covers Monolog\Formatter\JsonFormatter::__construct - * @covers Monolog\Formatter\JsonFormatter::getBatchMode - * @covers Monolog\Formatter\JsonFormatter::isAppendingNewlines - */ - public function testConstruct() - { - $formatter = new JsonFormatter(); - $this->assertEquals(JsonFormatter::BATCH_MODE_JSON, $formatter->getBatchMode()); - $this->assertEquals(true, $formatter->isAppendingNewlines()); - $formatter = new JsonFormatter(JsonFormatter::BATCH_MODE_NEWLINES, false); - $this->assertEquals(JsonFormatter::BATCH_MODE_NEWLINES, $formatter->getBatchMode()); - $this->assertEquals(false, $formatter->isAppendingNewlines()); - } - - /** - * @covers Monolog\Formatter\JsonFormatter::format - */ - public function testFormat() - { - $formatter = new JsonFormatter(); - $record = $this->getRecord(); - $this->assertEquals(json_encode($record)."\n", $formatter->format($record)); - - $formatter = new JsonFormatter(JsonFormatter::BATCH_MODE_JSON, false); - $record = $this->getRecord(); - $this->assertEquals(json_encode($record), $formatter->format($record)); - } - - /** - * @covers Monolog\Formatter\JsonFormatter::formatBatch - * @covers Monolog\Formatter\JsonFormatter::formatBatchJson - */ - public function testFormatBatch() - { - $formatter = new JsonFormatter(); - $records = array( - $this->getRecord(Logger::WARNING), - $this->getRecord(Logger::DEBUG), - ); - $this->assertEquals(json_encode($records), $formatter->formatBatch($records)); - } - - /** - * @covers Monolog\Formatter\JsonFormatter::formatBatch - * @covers Monolog\Formatter\JsonFormatter::formatBatchNewlines - */ - public function testFormatBatchNewlines() - { - $formatter = new JsonFormatter(JsonFormatter::BATCH_MODE_NEWLINES); - $records = $expected = array( - $this->getRecord(Logger::WARNING), - $this->getRecord(Logger::DEBUG), - ); - array_walk($expected, function (&$value, $key) { - $value = json_encode($value); - }); - $this->assertEquals(implode("\n", $expected), $formatter->formatBatch($records)); - } - - public function testDefFormatWithException() - { - $formatter = new JsonFormatter(); - $exception = new \RuntimeException('Foo'); - $formattedException = $this->formatException($exception); - - $message = $this->formatRecordWithExceptionInContext($formatter, $exception); - - $this->assertContextContainsFormattedException($formattedException, $message); - } - - public function testDefFormatWithPreviousException() - { - $formatter = new JsonFormatter(); - $exception = new \RuntimeException('Foo', 0, new \LogicException('Wut?')); - $formattedPrevException = $this->formatException($exception->getPrevious()); - $formattedException = $this->formatException($exception, $formattedPrevException); - - $message = $this->formatRecordWithExceptionInContext($formatter, $exception); - - $this->assertContextContainsFormattedException($formattedException, $message); - } - - public function testDefFormatWithThrowable() - { - if (!class_exists('Error') || !is_subclass_of('Error', 'Throwable')) { - $this->markTestSkipped('Requires PHP >=7'); - } - - $formatter = new JsonFormatter(); - $throwable = new \Error('Foo'); - $formattedThrowable = $this->formatException($throwable); - - $message = $this->formatRecordWithExceptionInContext($formatter, $throwable); - - $this->assertContextContainsFormattedException($formattedThrowable, $message); - } - - /** - * @param string $expected - * @param string $actual - * - * @internal param string $exception - */ - private function assertContextContainsFormattedException($expected, $actual) - { - $this->assertEquals( - '{"level_name":"CRITICAL","channel":"core","context":{"exception":'.$expected.'},"datetime":null,"extra":[],"message":"foobar"}'."\n", - $actual - ); - } - - /** - * @param JsonFormatter $formatter - * @param \Exception|\Throwable $exception - * - * @return string - */ - private function formatRecordWithExceptionInContext(JsonFormatter $formatter, $exception) - { - $message = $formatter->format(array( - 'level_name' => 'CRITICAL', - 'channel' => 'core', - 'context' => array('exception' => $exception), - 'datetime' => null, - 'extra' => array(), - 'message' => 'foobar', - )); - return $message; - } - - /** - * @param \Exception|\Throwable $exception - * - * @return string - */ - private function formatExceptionFilePathWithLine($exception) - { - $options = 0; - if (version_compare(PHP_VERSION, '5.4.0', '>=')) { - $options = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE; - } - $path = substr(json_encode($exception->getFile(), $options), 1, -1); - return $path . ':' . $exception->getLine(); - } - - /** - * @param \Exception|\Throwable $exception - * - * @param null|string $previous - * - * @return string - */ - private function formatException($exception, $previous = null) - { - $formattedException = - '{"class":"' . get_class($exception) . - '","message":"' . $exception->getMessage() . - '","code":' . $exception->getCode() . - ',"file":"' . $this->formatExceptionFilePathWithLine($exception) . - ($previous ? '","previous":' . $previous : '"') . - '}'; - return $formattedException; - } - - public function testNormalizeHandleLargeArraysWithExactly1000Items() - { - $formatter = new NormalizerFormatter(); - $largeArray = range(1, 1000); - - $res = $formatter->format(array( - 'level_name' => 'CRITICAL', - 'channel' => 'test', - 'message' => 'bar', - 'context' => array($largeArray), - 'datetime' => new \DateTime, - 'extra' => array(), - )); - - $this->assertCount(1000, $res['context'][0]); - $this->assertArrayNotHasKey('...', $res['context'][0]); - } - - public function testNormalizeHandleLargeArrays() - { - $formatter = new NormalizerFormatter(); - $largeArray = range(1, 2000); - - $res = $formatter->format(array( - 'level_name' => 'CRITICAL', - 'channel' => 'test', - 'message' => 'bar', - 'context' => array($largeArray), - 'datetime' => new \DateTime, - 'extra' => array(), - )); - - $this->assertCount(1001, $res['context'][0]); - $this->assertEquals('Over 1000 items (2000 total), aborting normalization', $res['context'][0]['...']); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Formatter/LineFormatterTest.php b/vendor/monolog/monolog/tests/Monolog/Formatter/LineFormatterTest.php deleted file mode 100644 index 310d93c..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Formatter/LineFormatterTest.php +++ /dev/null @@ -1,222 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Formatter; - -/** - * @covers Monolog\Formatter\LineFormatter - */ -class LineFormatterTest extends \PHPUnit_Framework_TestCase -{ - public function testDefFormatWithString() - { - $formatter = new LineFormatter(null, 'Y-m-d'); - $message = $formatter->format(array( - 'level_name' => 'WARNING', - 'channel' => 'log', - 'context' => array(), - 'message' => 'foo', - 'datetime' => new \DateTime, - 'extra' => array(), - )); - $this->assertEquals('['.date('Y-m-d').'] log.WARNING: foo [] []'."\n", $message); - } - - public function testDefFormatWithArrayContext() - { - $formatter = new LineFormatter(null, 'Y-m-d'); - $message = $formatter->format(array( - 'level_name' => 'ERROR', - 'channel' => 'meh', - 'message' => 'foo', - 'datetime' => new \DateTime, - 'extra' => array(), - 'context' => array( - 'foo' => 'bar', - 'baz' => 'qux', - 'bool' => false, - 'null' => null, - ), - )); - $this->assertEquals('['.date('Y-m-d').'] meh.ERROR: foo {"foo":"bar","baz":"qux","bool":false,"null":null} []'."\n", $message); - } - - public function testDefFormatExtras() - { - $formatter = new LineFormatter(null, 'Y-m-d'); - $message = $formatter->format(array( - 'level_name' => 'ERROR', - 'channel' => 'meh', - 'context' => array(), - 'datetime' => new \DateTime, - 'extra' => array('ip' => '127.0.0.1'), - 'message' => 'log', - )); - $this->assertEquals('['.date('Y-m-d').'] meh.ERROR: log [] {"ip":"127.0.0.1"}'."\n", $message); - } - - public function testFormatExtras() - { - $formatter = new LineFormatter("[%datetime%] %channel%.%level_name%: %message% %context% %extra.file% %extra%\n", 'Y-m-d'); - $message = $formatter->format(array( - 'level_name' => 'ERROR', - 'channel' => 'meh', - 'context' => array(), - 'datetime' => new \DateTime, - 'extra' => array('ip' => '127.0.0.1', 'file' => 'test'), - 'message' => 'log', - )); - $this->assertEquals('['.date('Y-m-d').'] meh.ERROR: log [] test {"ip":"127.0.0.1"}'."\n", $message); - } - - public function testContextAndExtraOptionallyNotShownIfEmpty() - { - $formatter = new LineFormatter(null, 'Y-m-d', false, true); - $message = $formatter->format(array( - 'level_name' => 'ERROR', - 'channel' => 'meh', - 'context' => array(), - 'datetime' => new \DateTime, - 'extra' => array(), - 'message' => 'log', - )); - $this->assertEquals('['.date('Y-m-d').'] meh.ERROR: log '."\n", $message); - } - - public function testContextAndExtraReplacement() - { - $formatter = new LineFormatter('%context.foo% => %extra.foo%'); - $message = $formatter->format(array( - 'level_name' => 'ERROR', - 'channel' => 'meh', - 'context' => array('foo' => 'bar'), - 'datetime' => new \DateTime, - 'extra' => array('foo' => 'xbar'), - 'message' => 'log', - )); - $this->assertEquals('bar => xbar', $message); - } - - public function testDefFormatWithObject() - { - $formatter = new LineFormatter(null, 'Y-m-d'); - $message = $formatter->format(array( - 'level_name' => 'ERROR', - 'channel' => 'meh', - 'context' => array(), - 'datetime' => new \DateTime, - 'extra' => array('foo' => new TestFoo, 'bar' => new TestBar, 'baz' => array(), 'res' => fopen('php://memory', 'rb')), - 'message' => 'foobar', - )); - - $this->assertEquals('['.date('Y-m-d').'] meh.ERROR: foobar [] {"foo":"[object] (Monolog\\\\Formatter\\\\TestFoo: {\\"foo\\":\\"foo\\"})","bar":"[object] (Monolog\\\\Formatter\\\\TestBar: bar)","baz":[],"res":"[resource] (stream)"}'."\n", $message); - } - - public function testDefFormatWithException() - { - $formatter = new LineFormatter(null, 'Y-m-d'); - $message = $formatter->format(array( - 'level_name' => 'CRITICAL', - 'channel' => 'core', - 'context' => array('exception' => new \RuntimeException('Foo')), - 'datetime' => new \DateTime, - 'extra' => array(), - 'message' => 'foobar', - )); - - $path = str_replace('\\/', '/', json_encode(__FILE__)); - - $this->assertEquals('['.date('Y-m-d').'] core.CRITICAL: foobar {"exception":"[object] (RuntimeException(code: 0): Foo at '.substr($path, 1, -1).':'.(__LINE__ - 8).')"} []'."\n", $message); - } - - public function testDefFormatWithPreviousException() - { - $formatter = new LineFormatter(null, 'Y-m-d'); - $previous = new \LogicException('Wut?'); - $message = $formatter->format(array( - 'level_name' => 'CRITICAL', - 'channel' => 'core', - 'context' => array('exception' => new \RuntimeException('Foo', 0, $previous)), - 'datetime' => new \DateTime, - 'extra' => array(), - 'message' => 'foobar', - )); - - $path = str_replace('\\/', '/', json_encode(__FILE__)); - - $this->assertEquals('['.date('Y-m-d').'] core.CRITICAL: foobar {"exception":"[object] (RuntimeException(code: 0): Foo at '.substr($path, 1, -1).':'.(__LINE__ - 8).', LogicException(code: 0): Wut? at '.substr($path, 1, -1).':'.(__LINE__ - 12).')"} []'."\n", $message); - } - - public function testBatchFormat() - { - $formatter = new LineFormatter(null, 'Y-m-d'); - $message = $formatter->formatBatch(array( - array( - 'level_name' => 'CRITICAL', - 'channel' => 'test', - 'message' => 'bar', - 'context' => array(), - 'datetime' => new \DateTime, - 'extra' => array(), - ), - array( - 'level_name' => 'WARNING', - 'channel' => 'log', - 'message' => 'foo', - 'context' => array(), - 'datetime' => new \DateTime, - 'extra' => array(), - ), - )); - $this->assertEquals('['.date('Y-m-d').'] test.CRITICAL: bar [] []'."\n".'['.date('Y-m-d').'] log.WARNING: foo [] []'."\n", $message); - } - - public function testFormatShouldStripInlineLineBreaks() - { - $formatter = new LineFormatter(null, 'Y-m-d'); - $message = $formatter->format( - array( - 'message' => "foo\nbar", - 'context' => array(), - 'extra' => array(), - ) - ); - - $this->assertRegExp('/foo bar/', $message); - } - - public function testFormatShouldNotStripInlineLineBreaksWhenFlagIsSet() - { - $formatter = new LineFormatter(null, 'Y-m-d', true); - $message = $formatter->format( - array( - 'message' => "foo\nbar", - 'context' => array(), - 'extra' => array(), - ) - ); - - $this->assertRegExp('/foo\nbar/', $message); - } -} - -class TestFoo -{ - public $foo = 'foo'; -} - -class TestBar -{ - public function __toString() - { - return 'bar'; - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Formatter/LogglyFormatterTest.php b/vendor/monolog/monolog/tests/Monolog/Formatter/LogglyFormatterTest.php deleted file mode 100644 index 6d59b3f..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Formatter/LogglyFormatterTest.php +++ /dev/null @@ -1,40 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Formatter; - -use Monolog\TestCase; - -class LogglyFormatterTest extends TestCase -{ - /** - * @covers Monolog\Formatter\LogglyFormatter::__construct - */ - public function testConstruct() - { - $formatter = new LogglyFormatter(); - $this->assertEquals(LogglyFormatter::BATCH_MODE_NEWLINES, $formatter->getBatchMode()); - $formatter = new LogglyFormatter(LogglyFormatter::BATCH_MODE_JSON); - $this->assertEquals(LogglyFormatter::BATCH_MODE_JSON, $formatter->getBatchMode()); - } - - /** - * @covers Monolog\Formatter\LogglyFormatter::format - */ - public function testFormat() - { - $formatter = new LogglyFormatter(); - $record = $this->getRecord(); - $formatted_decoded = json_decode($formatter->format($record), true); - $this->assertArrayHasKey("timestamp", $formatted_decoded); - $this->assertEquals(new \DateTime($formatted_decoded["timestamp"]), $record["datetime"]); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Formatter/LogstashFormatterTest.php b/vendor/monolog/monolog/tests/Monolog/Formatter/LogstashFormatterTest.php deleted file mode 100644 index 9f6b1cc..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Formatter/LogstashFormatterTest.php +++ /dev/null @@ -1,333 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Formatter; - -use Monolog\Logger; - -class LogstashFormatterTest extends \PHPUnit_Framework_TestCase -{ - public function tearDown() - { - \PHPUnit_Framework_Error_Warning::$enabled = true; - - return parent::tearDown(); - } - - /** - * @covers Monolog\Formatter\LogstashFormatter::format - */ - public function testDefaultFormatter() - { - $formatter = new LogstashFormatter('test', 'hostname'); - $record = array( - 'level' => Logger::ERROR, - 'level_name' => 'ERROR', - 'channel' => 'meh', - 'context' => array(), - 'datetime' => new \DateTime("@0"), - 'extra' => array(), - 'message' => 'log', - ); - - $message = json_decode($formatter->format($record), true); - - $this->assertEquals("1970-01-01T00:00:00.000000+00:00", $message['@timestamp']); - $this->assertEquals('log', $message['@message']); - $this->assertEquals('meh', $message['@fields']['channel']); - $this->assertContains('meh', $message['@tags']); - $this->assertEquals(Logger::ERROR, $message['@fields']['level']); - $this->assertEquals('test', $message['@type']); - $this->assertEquals('hostname', $message['@source']); - - $formatter = new LogstashFormatter('mysystem'); - - $message = json_decode($formatter->format($record), true); - - $this->assertEquals('mysystem', $message['@type']); - } - - /** - * @covers Monolog\Formatter\LogstashFormatter::format - */ - public function testFormatWithFileAndLine() - { - $formatter = new LogstashFormatter('test'); - $record = array( - 'level' => Logger::ERROR, - 'level_name' => 'ERROR', - 'channel' => 'meh', - 'context' => array('from' => 'logger'), - 'datetime' => new \DateTime("@0"), - 'extra' => array('file' => 'test', 'line' => 14), - 'message' => 'log', - ); - - $message = json_decode($formatter->format($record), true); - - $this->assertEquals('test', $message['@fields']['file']); - $this->assertEquals(14, $message['@fields']['line']); - } - - /** - * @covers Monolog\Formatter\LogstashFormatter::format - */ - public function testFormatWithContext() - { - $formatter = new LogstashFormatter('test'); - $record = array( - 'level' => Logger::ERROR, - 'level_name' => 'ERROR', - 'channel' => 'meh', - 'context' => array('from' => 'logger'), - 'datetime' => new \DateTime("@0"), - 'extra' => array('key' => 'pair'), - 'message' => 'log', - ); - - $message = json_decode($formatter->format($record), true); - - $message_array = $message['@fields']; - - $this->assertArrayHasKey('ctxt_from', $message_array); - $this->assertEquals('logger', $message_array['ctxt_from']); - - // Test with extraPrefix - $formatter = new LogstashFormatter('test', null, null, 'CTX'); - $message = json_decode($formatter->format($record), true); - - $message_array = $message['@fields']; - - $this->assertArrayHasKey('CTXfrom', $message_array); - $this->assertEquals('logger', $message_array['CTXfrom']); - } - - /** - * @covers Monolog\Formatter\LogstashFormatter::format - */ - public function testFormatWithExtra() - { - $formatter = new LogstashFormatter('test'); - $record = array( - 'level' => Logger::ERROR, - 'level_name' => 'ERROR', - 'channel' => 'meh', - 'context' => array('from' => 'logger'), - 'datetime' => new \DateTime("@0"), - 'extra' => array('key' => 'pair'), - 'message' => 'log', - ); - - $message = json_decode($formatter->format($record), true); - - $message_array = $message['@fields']; - - $this->assertArrayHasKey('key', $message_array); - $this->assertEquals('pair', $message_array['key']); - - // Test with extraPrefix - $formatter = new LogstashFormatter('test', null, 'EXT'); - $message = json_decode($formatter->format($record), true); - - $message_array = $message['@fields']; - - $this->assertArrayHasKey('EXTkey', $message_array); - $this->assertEquals('pair', $message_array['EXTkey']); - } - - public function testFormatWithApplicationName() - { - $formatter = new LogstashFormatter('app', 'test'); - $record = array( - 'level' => Logger::ERROR, - 'level_name' => 'ERROR', - 'channel' => 'meh', - 'context' => array('from' => 'logger'), - 'datetime' => new \DateTime("@0"), - 'extra' => array('key' => 'pair'), - 'message' => 'log', - ); - - $message = json_decode($formatter->format($record), true); - - $this->assertArrayHasKey('@type', $message); - $this->assertEquals('app', $message['@type']); - } - - /** - * @covers Monolog\Formatter\LogstashFormatter::format - */ - public function testDefaultFormatterV1() - { - $formatter = new LogstashFormatter('test', 'hostname', null, 'ctxt_', LogstashFormatter::V1); - $record = array( - 'level' => Logger::ERROR, - 'level_name' => 'ERROR', - 'channel' => 'meh', - 'context' => array(), - 'datetime' => new \DateTime("@0"), - 'extra' => array(), - 'message' => 'log', - ); - - $message = json_decode($formatter->format($record), true); - - $this->assertEquals("1970-01-01T00:00:00.000000+00:00", $message['@timestamp']); - $this->assertEquals("1", $message['@version']); - $this->assertEquals('log', $message['message']); - $this->assertEquals('meh', $message['channel']); - $this->assertEquals('ERROR', $message['level']); - $this->assertEquals('test', $message['type']); - $this->assertEquals('hostname', $message['host']); - - $formatter = new LogstashFormatter('mysystem', null, null, 'ctxt_', LogstashFormatter::V1); - - $message = json_decode($formatter->format($record), true); - - $this->assertEquals('mysystem', $message['type']); - } - - /** - * @covers Monolog\Formatter\LogstashFormatter::format - */ - public function testFormatWithFileAndLineV1() - { - $formatter = new LogstashFormatter('test', null, null, 'ctxt_', LogstashFormatter::V1); - $record = array( - 'level' => Logger::ERROR, - 'level_name' => 'ERROR', - 'channel' => 'meh', - 'context' => array('from' => 'logger'), - 'datetime' => new \DateTime("@0"), - 'extra' => array('file' => 'test', 'line' => 14), - 'message' => 'log', - ); - - $message = json_decode($formatter->format($record), true); - - $this->assertEquals('test', $message['file']); - $this->assertEquals(14, $message['line']); - } - - /** - * @covers Monolog\Formatter\LogstashFormatter::format - */ - public function testFormatWithContextV1() - { - $formatter = new LogstashFormatter('test', null, null, 'ctxt_', LogstashFormatter::V1); - $record = array( - 'level' => Logger::ERROR, - 'level_name' => 'ERROR', - 'channel' => 'meh', - 'context' => array('from' => 'logger'), - 'datetime' => new \DateTime("@0"), - 'extra' => array('key' => 'pair'), - 'message' => 'log', - ); - - $message = json_decode($formatter->format($record), true); - - $this->assertArrayHasKey('ctxt_from', $message); - $this->assertEquals('logger', $message['ctxt_from']); - - // Test with extraPrefix - $formatter = new LogstashFormatter('test', null, null, 'CTX', LogstashFormatter::V1); - $message = json_decode($formatter->format($record), true); - - $this->assertArrayHasKey('CTXfrom', $message); - $this->assertEquals('logger', $message['CTXfrom']); - } - - /** - * @covers Monolog\Formatter\LogstashFormatter::format - */ - public function testFormatWithExtraV1() - { - $formatter = new LogstashFormatter('test', null, null, 'ctxt_', LogstashFormatter::V1); - $record = array( - 'level' => Logger::ERROR, - 'level_name' => 'ERROR', - 'channel' => 'meh', - 'context' => array('from' => 'logger'), - 'datetime' => new \DateTime("@0"), - 'extra' => array('key' => 'pair'), - 'message' => 'log', - ); - - $message = json_decode($formatter->format($record), true); - - $this->assertArrayHasKey('key', $message); - $this->assertEquals('pair', $message['key']); - - // Test with extraPrefix - $formatter = new LogstashFormatter('test', null, 'EXT', 'ctxt_', LogstashFormatter::V1); - $message = json_decode($formatter->format($record), true); - - $this->assertArrayHasKey('EXTkey', $message); - $this->assertEquals('pair', $message['EXTkey']); - } - - public function testFormatWithApplicationNameV1() - { - $formatter = new LogstashFormatter('app', 'test', null, 'ctxt_', LogstashFormatter::V1); - $record = array( - 'level' => Logger::ERROR, - 'level_name' => 'ERROR', - 'channel' => 'meh', - 'context' => array('from' => 'logger'), - 'datetime' => new \DateTime("@0"), - 'extra' => array('key' => 'pair'), - 'message' => 'log', - ); - - $message = json_decode($formatter->format($record), true); - - $this->assertArrayHasKey('type', $message); - $this->assertEquals('app', $message['type']); - } - - public function testFormatWithLatin9Data() - { - if (version_compare(PHP_VERSION, '5.5.0', '<')) { - // Ignore the warning that will be emitted by PHP <5.5.0 - \PHPUnit_Framework_Error_Warning::$enabled = false; - } - $formatter = new LogstashFormatter('test', 'hostname'); - $record = array( - 'level' => Logger::ERROR, - 'level_name' => 'ERROR', - 'channel' => '¯\_(ツ)_/¯', - 'context' => array(), - 'datetime' => new \DateTime("@0"), - 'extra' => array( - 'user_agent' => "\xD6WN; FBCR/OrangeEspa\xF1a; Vers\xE3o/4.0; F\xE4rist", - ), - 'message' => 'log', - ); - - $message = json_decode($formatter->format($record), true); - - $this->assertEquals("1970-01-01T00:00:00.000000+00:00", $message['@timestamp']); - $this->assertEquals('log', $message['@message']); - $this->assertEquals('¯\_(ツ)_/¯', $message['@fields']['channel']); - $this->assertContains('¯\_(ツ)_/¯', $message['@tags']); - $this->assertEquals(Logger::ERROR, $message['@fields']['level']); - $this->assertEquals('test', $message['@type']); - $this->assertEquals('hostname', $message['@source']); - if (version_compare(PHP_VERSION, '5.5.0', '>=')) { - $this->assertEquals('ÖWN; FBCR/OrangeEspaña; Versão/4.0; Färist', $message['@fields']['user_agent']); - } else { - // PHP <5.5 does not return false for an element encoding failure, - // instead it emits a warning (possibly) and nulls the value. - $this->assertEquals(null, $message['@fields']['user_agent']); - } - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Formatter/MongoDBFormatterTest.php b/vendor/monolog/monolog/tests/Monolog/Formatter/MongoDBFormatterTest.php deleted file mode 100644 index 52e699e..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Formatter/MongoDBFormatterTest.php +++ /dev/null @@ -1,262 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Formatter; - -use Monolog\Logger; - -/** - * @author Florian Plattner - */ -class MongoDBFormatterTest extends \PHPUnit_Framework_TestCase -{ - public function setUp() - { - if (!class_exists('MongoDate')) { - $this->markTestSkipped('mongo extension not installed'); - } - } - - public function constructArgumentProvider() - { - return array( - array(1, true, 1, true), - array(0, false, 0, false), - ); - } - - /** - * @param $traceDepth - * @param $traceAsString - * @param $expectedTraceDepth - * @param $expectedTraceAsString - * - * @dataProvider constructArgumentProvider - */ - public function testConstruct($traceDepth, $traceAsString, $expectedTraceDepth, $expectedTraceAsString) - { - $formatter = new MongoDBFormatter($traceDepth, $traceAsString); - - $reflTrace = new \ReflectionProperty($formatter, 'exceptionTraceAsString'); - $reflTrace->setAccessible(true); - $this->assertEquals($expectedTraceAsString, $reflTrace->getValue($formatter)); - - $reflDepth = new\ReflectionProperty($formatter, 'maxNestingLevel'); - $reflDepth->setAccessible(true); - $this->assertEquals($expectedTraceDepth, $reflDepth->getValue($formatter)); - } - - public function testSimpleFormat() - { - $record = array( - 'message' => 'some log message', - 'context' => array(), - 'level' => Logger::WARNING, - 'level_name' => Logger::getLevelName(Logger::WARNING), - 'channel' => 'test', - 'datetime' => new \DateTime('2014-02-01 00:00:00'), - 'extra' => array(), - ); - - $formatter = new MongoDBFormatter(); - $formattedRecord = $formatter->format($record); - - $this->assertCount(7, $formattedRecord); - $this->assertEquals('some log message', $formattedRecord['message']); - $this->assertEquals(array(), $formattedRecord['context']); - $this->assertEquals(Logger::WARNING, $formattedRecord['level']); - $this->assertEquals(Logger::getLevelName(Logger::WARNING), $formattedRecord['level_name']); - $this->assertEquals('test', $formattedRecord['channel']); - $this->assertInstanceOf('\MongoDate', $formattedRecord['datetime']); - $this->assertEquals('0.00000000 1391212800', $formattedRecord['datetime']->__toString()); - $this->assertEquals(array(), $formattedRecord['extra']); - } - - public function testRecursiveFormat() - { - $someObject = new \stdClass(); - $someObject->foo = 'something'; - $someObject->bar = 'stuff'; - - $record = array( - 'message' => 'some log message', - 'context' => array( - 'stuff' => new \DateTime('2014-02-01 02:31:33'), - 'some_object' => $someObject, - 'context_string' => 'some string', - 'context_int' => 123456, - 'except' => new \Exception('exception message', 987), - ), - 'level' => Logger::WARNING, - 'level_name' => Logger::getLevelName(Logger::WARNING), - 'channel' => 'test', - 'datetime' => new \DateTime('2014-02-01 00:00:00'), - 'extra' => array(), - ); - - $formatter = new MongoDBFormatter(); - $formattedRecord = $formatter->format($record); - - $this->assertCount(5, $formattedRecord['context']); - $this->assertInstanceOf('\MongoDate', $formattedRecord['context']['stuff']); - $this->assertEquals('0.00000000 1391221893', $formattedRecord['context']['stuff']->__toString()); - $this->assertEquals( - array( - 'foo' => 'something', - 'bar' => 'stuff', - 'class' => 'stdClass', - ), - $formattedRecord['context']['some_object'] - ); - $this->assertEquals('some string', $formattedRecord['context']['context_string']); - $this->assertEquals(123456, $formattedRecord['context']['context_int']); - - $this->assertCount(5, $formattedRecord['context']['except']); - $this->assertEquals('exception message', $formattedRecord['context']['except']['message']); - $this->assertEquals(987, $formattedRecord['context']['except']['code']); - $this->assertInternalType('string', $formattedRecord['context']['except']['file']); - $this->assertInternalType('integer', $formattedRecord['context']['except']['code']); - $this->assertInternalType('string', $formattedRecord['context']['except']['trace']); - $this->assertEquals('Exception', $formattedRecord['context']['except']['class']); - } - - public function testFormatDepthArray() - { - $record = array( - 'message' => 'some log message', - 'context' => array( - 'nest2' => array( - 'property' => 'anything', - 'nest3' => array( - 'nest4' => 'value', - 'property' => 'nothing', - ), - ), - ), - 'level' => Logger::WARNING, - 'level_name' => Logger::getLevelName(Logger::WARNING), - 'channel' => 'test', - 'datetime' => new \DateTime('2014-02-01 00:00:00'), - 'extra' => array(), - ); - - $formatter = new MongoDBFormatter(2); - $formattedResult = $formatter->format($record); - - $this->assertEquals( - array( - 'nest2' => array( - 'property' => 'anything', - 'nest3' => '[...]', - ), - ), - $formattedResult['context'] - ); - } - - public function testFormatDepthArrayInfiniteNesting() - { - $record = array( - 'message' => 'some log message', - 'context' => array( - 'nest2' => array( - 'property' => 'something', - 'nest3' => array( - 'property' => 'anything', - 'nest4' => array( - 'property' => 'nothing', - ), - ), - ), - ), - 'level' => Logger::WARNING, - 'level_name' => Logger::getLevelName(Logger::WARNING), - 'channel' => 'test', - 'datetime' => new \DateTime('2014-02-01 00:00:00'), - 'extra' => array(), - ); - - $formatter = new MongoDBFormatter(0); - $formattedResult = $formatter->format($record); - - $this->assertEquals( - array( - 'nest2' => array( - 'property' => 'something', - 'nest3' => array( - 'property' => 'anything', - 'nest4' => array( - 'property' => 'nothing', - ), - ), - ), - ), - $formattedResult['context'] - ); - } - - public function testFormatDepthObjects() - { - $someObject = new \stdClass(); - $someObject->property = 'anything'; - $someObject->nest3 = new \stdClass(); - $someObject->nest3->property = 'nothing'; - $someObject->nest3->nest4 = 'invisible'; - - $record = array( - 'message' => 'some log message', - 'context' => array( - 'nest2' => $someObject, - ), - 'level' => Logger::WARNING, - 'level_name' => Logger::getLevelName(Logger::WARNING), - 'channel' => 'test', - 'datetime' => new \DateTime('2014-02-01 00:00:00'), - 'extra' => array(), - ); - - $formatter = new MongoDBFormatter(2, true); - $formattedResult = $formatter->format($record); - - $this->assertEquals( - array( - 'nest2' => array( - 'property' => 'anything', - 'nest3' => '[...]', - 'class' => 'stdClass', - ), - ), - $formattedResult['context'] - ); - } - - public function testFormatDepthException() - { - $record = array( - 'message' => 'some log message', - 'context' => array( - 'nest2' => new \Exception('exception message', 987), - ), - 'level' => Logger::WARNING, - 'level_name' => Logger::getLevelName(Logger::WARNING), - 'channel' => 'test', - 'datetime' => new \DateTime('2014-02-01 00:00:00'), - 'extra' => array(), - ); - - $formatter = new MongoDBFormatter(2, false); - $formattedRecord = $formatter->format($record); - - $this->assertEquals('exception message', $formattedRecord['context']['nest2']['message']); - $this->assertEquals(987, $formattedRecord['context']['nest2']['code']); - $this->assertEquals('[...]', $formattedRecord['context']['nest2']['trace']); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Formatter/NormalizerFormatterTest.php b/vendor/monolog/monolog/tests/Monolog/Formatter/NormalizerFormatterTest.php deleted file mode 100644 index bafd1c7..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Formatter/NormalizerFormatterTest.php +++ /dev/null @@ -1,481 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Formatter; - -/** - * @covers Monolog\Formatter\NormalizerFormatter - */ -class NormalizerFormatterTest extends \PHPUnit_Framework_TestCase -{ - public function tearDown() - { - \PHPUnit_Framework_Error_Warning::$enabled = true; - - return parent::tearDown(); - } - - public function testFormat() - { - $formatter = new NormalizerFormatter('Y-m-d'); - $formatted = $formatter->format(array( - 'level_name' => 'ERROR', - 'channel' => 'meh', - 'message' => 'foo', - 'datetime' => new \DateTime, - 'extra' => array('foo' => new TestFooNorm, 'bar' => new TestBarNorm, 'baz' => array(), 'res' => fopen('php://memory', 'rb')), - 'context' => array( - 'foo' => 'bar', - 'baz' => 'qux', - 'inf' => INF, - '-inf' => -INF, - 'nan' => acos(4), - ), - )); - - $this->assertEquals(array( - 'level_name' => 'ERROR', - 'channel' => 'meh', - 'message' => 'foo', - 'datetime' => date('Y-m-d'), - 'extra' => array( - 'foo' => '[object] (Monolog\\Formatter\\TestFooNorm: {"foo":"foo"})', - 'bar' => '[object] (Monolog\\Formatter\\TestBarNorm: bar)', - 'baz' => array(), - 'res' => '[resource] (stream)', - ), - 'context' => array( - 'foo' => 'bar', - 'baz' => 'qux', - 'inf' => 'INF', - '-inf' => '-INF', - 'nan' => 'NaN', - ), - ), $formatted); - } - - public function testFormatExceptions() - { - $formatter = new NormalizerFormatter('Y-m-d'); - $e = new \LogicException('bar'); - $e2 = new \RuntimeException('foo', 0, $e); - $formatted = $formatter->format(array( - 'exception' => $e2, - )); - - $this->assertGreaterThan(5, count($formatted['exception']['trace'])); - $this->assertTrue(isset($formatted['exception']['previous'])); - unset($formatted['exception']['trace'], $formatted['exception']['previous']); - - $this->assertEquals(array( - 'exception' => array( - 'class' => get_class($e2), - 'message' => $e2->getMessage(), - 'code' => $e2->getCode(), - 'file' => $e2->getFile().':'.$e2->getLine(), - ), - ), $formatted); - } - - public function testFormatSoapFaultException() - { - if (!class_exists('SoapFault')) { - $this->markTestSkipped('Requires the soap extension'); - } - - $formatter = new NormalizerFormatter('Y-m-d'); - $e = new \SoapFault('foo', 'bar', 'hello', 'world'); - $formatted = $formatter->format(array( - 'exception' => $e, - )); - - unset($formatted['exception']['trace']); - - $this->assertEquals(array( - 'exception' => array( - 'class' => 'SoapFault', - 'message' => 'bar', - 'code' => 0, - 'file' => $e->getFile().':'.$e->getLine(), - 'faultcode' => 'foo', - 'faultactor' => 'hello', - 'detail' => 'world', - ), - ), $formatted); - } - - public function testFormatToStringExceptionHandle() - { - $formatter = new NormalizerFormatter('Y-m-d'); - $this->setExpectedException('RuntimeException', 'Could not convert to string'); - $formatter->format(array( - 'myObject' => new TestToStringError(), - )); - } - - public function testBatchFormat() - { - $formatter = new NormalizerFormatter('Y-m-d'); - $formatted = $formatter->formatBatch(array( - array( - 'level_name' => 'CRITICAL', - 'channel' => 'test', - 'message' => 'bar', - 'context' => array(), - 'datetime' => new \DateTime, - 'extra' => array(), - ), - array( - 'level_name' => 'WARNING', - 'channel' => 'log', - 'message' => 'foo', - 'context' => array(), - 'datetime' => new \DateTime, - 'extra' => array(), - ), - )); - $this->assertEquals(array( - array( - 'level_name' => 'CRITICAL', - 'channel' => 'test', - 'message' => 'bar', - 'context' => array(), - 'datetime' => date('Y-m-d'), - 'extra' => array(), - ), - array( - 'level_name' => 'WARNING', - 'channel' => 'log', - 'message' => 'foo', - 'context' => array(), - 'datetime' => date('Y-m-d'), - 'extra' => array(), - ), - ), $formatted); - } - - /** - * Test issue #137 - */ - public function testIgnoresRecursiveObjectReferences() - { - // set up the recursion - $foo = new \stdClass(); - $bar = new \stdClass(); - - $foo->bar = $bar; - $bar->foo = $foo; - - // set an error handler to assert that the error is not raised anymore - $that = $this; - set_error_handler(function ($level, $message, $file, $line, $context) use ($that) { - if (error_reporting() & $level) { - restore_error_handler(); - $that->fail("$message should not be raised"); - } - }); - - $formatter = new NormalizerFormatter(); - $reflMethod = new \ReflectionMethod($formatter, 'toJson'); - $reflMethod->setAccessible(true); - $res = $reflMethod->invoke($formatter, array($foo, $bar), true); - - restore_error_handler(); - - $this->assertEquals(@json_encode(array($foo, $bar)), $res); - } - - public function testCanNormalizeReferences() - { - $formatter = new NormalizerFormatter(); - $x = array('foo' => 'bar'); - $y = array('x' => &$x); - $x['y'] = &$y; - $formatter->format($y); - } - - public function testIgnoresInvalidTypes() - { - // set up the recursion - $resource = fopen(__FILE__, 'r'); - - // set an error handler to assert that the error is not raised anymore - $that = $this; - set_error_handler(function ($level, $message, $file, $line, $context) use ($that) { - if (error_reporting() & $level) { - restore_error_handler(); - $that->fail("$message should not be raised"); - } - }); - - $formatter = new NormalizerFormatter(); - $reflMethod = new \ReflectionMethod($formatter, 'toJson'); - $reflMethod->setAccessible(true); - $res = $reflMethod->invoke($formatter, array($resource), true); - - restore_error_handler(); - - $this->assertEquals(@json_encode(array($resource)), $res); - } - - public function testNormalizeHandleLargeArraysWithExactly1000Items() - { - $formatter = new NormalizerFormatter(); - $largeArray = range(1, 1000); - - $res = $formatter->format(array( - 'level_name' => 'CRITICAL', - 'channel' => 'test', - 'message' => 'bar', - 'context' => array($largeArray), - 'datetime' => new \DateTime, - 'extra' => array(), - )); - - $this->assertCount(1000, $res['context'][0]); - $this->assertArrayNotHasKey('...', $res['context'][0]); - } - - public function testNormalizeHandleLargeArrays() - { - $formatter = new NormalizerFormatter(); - $largeArray = range(1, 2000); - - $res = $formatter->format(array( - 'level_name' => 'CRITICAL', - 'channel' => 'test', - 'message' => 'bar', - 'context' => array($largeArray), - 'datetime' => new \DateTime, - 'extra' => array(), - )); - - $this->assertCount(1001, $res['context'][0]); - $this->assertEquals('Over 1000 items (2000 total), aborting normalization', $res['context'][0]['...']); - } - - /** - * @expectedException RuntimeException - */ - public function testThrowsOnInvalidEncoding() - { - if (version_compare(PHP_VERSION, '5.5.0', '<')) { - // Ignore the warning that will be emitted by PHP <5.5.0 - \PHPUnit_Framework_Error_Warning::$enabled = false; - } - $formatter = new NormalizerFormatter(); - $reflMethod = new \ReflectionMethod($formatter, 'toJson'); - $reflMethod->setAccessible(true); - - // send an invalid unicode sequence as a object that can't be cleaned - $record = new \stdClass; - $record->message = "\xB1\x31"; - $res = $reflMethod->invoke($formatter, $record); - if (PHP_VERSION_ID < 50500 && $res === '{"message":null}') { - throw new \RuntimeException('PHP 5.3/5.4 throw a warning and null the value instead of returning false entirely'); - } - } - - public function testConvertsInvalidEncodingAsLatin9() - { - if (version_compare(PHP_VERSION, '5.5.0', '<')) { - // Ignore the warning that will be emitted by PHP <5.5.0 - \PHPUnit_Framework_Error_Warning::$enabled = false; - } - $formatter = new NormalizerFormatter(); - $reflMethod = new \ReflectionMethod($formatter, 'toJson'); - $reflMethod->setAccessible(true); - - $res = $reflMethod->invoke($formatter, array('message' => "\xA4\xA6\xA8\xB4\xB8\xBC\xBD\xBE")); - - if (version_compare(PHP_VERSION, '5.5.0', '>=')) { - $this->assertSame('{"message":"€ŠšŽžŒœŸ"}', $res); - } else { - // PHP <5.5 does not return false for an element encoding failure, - // instead it emits a warning (possibly) and nulls the value. - $this->assertSame('{"message":null}', $res); - } - } - - /** - * @param mixed $in Input - * @param mixed $expect Expected output - * @covers Monolog\Formatter\NormalizerFormatter::detectAndCleanUtf8 - * @dataProvider providesDetectAndCleanUtf8 - */ - public function testDetectAndCleanUtf8($in, $expect) - { - $formatter = new NormalizerFormatter(); - $formatter->detectAndCleanUtf8($in); - $this->assertSame($expect, $in); - } - - public function providesDetectAndCleanUtf8() - { - $obj = new \stdClass; - - return array( - 'null' => array(null, null), - 'int' => array(123, 123), - 'float' => array(123.45, 123.45), - 'bool false' => array(false, false), - 'bool true' => array(true, true), - 'ascii string' => array('abcdef', 'abcdef'), - 'latin9 string' => array("\xB1\x31\xA4\xA6\xA8\xB4\xB8\xBC\xBD\xBE\xFF", '±1€ŠšŽžŒœŸÿ'), - 'unicode string' => array('¤¦¨´¸¼½¾€ŠšŽžŒœŸ', '¤¦¨´¸¼½¾€ŠšŽžŒœŸ'), - 'empty array' => array(array(), array()), - 'array' => array(array('abcdef'), array('abcdef')), - 'object' => array($obj, $obj), - ); - } - - /** - * @param int $code - * @param string $msg - * @dataProvider providesHandleJsonErrorFailure - */ - public function testHandleJsonErrorFailure($code, $msg) - { - $formatter = new NormalizerFormatter(); - $reflMethod = new \ReflectionMethod($formatter, 'handleJsonError'); - $reflMethod->setAccessible(true); - - $this->setExpectedException('RuntimeException', $msg); - $reflMethod->invoke($formatter, $code, 'faked'); - } - - public function providesHandleJsonErrorFailure() - { - return array( - 'depth' => array(JSON_ERROR_DEPTH, 'Maximum stack depth exceeded'), - 'state' => array(JSON_ERROR_STATE_MISMATCH, 'Underflow or the modes mismatch'), - 'ctrl' => array(JSON_ERROR_CTRL_CHAR, 'Unexpected control character found'), - 'default' => array(-1, 'Unknown error'), - ); - } - - public function testExceptionTraceWithArgs() - { - if (defined('HHVM_VERSION')) { - $this->markTestSkipped('Not supported in HHVM since it detects errors differently'); - } - - // This happens i.e. in React promises or Guzzle streams where stream wrappers are registered - // and no file or line are included in the trace because it's treated as internal function - set_error_handler(function ($errno, $errstr, $errfile, $errline) { - throw new \ErrorException($errstr, 0, $errno, $errfile, $errline); - }); - - try { - // This will contain $resource and $wrappedResource as arguments in the trace item - $resource = fopen('php://memory', 'rw+'); - fwrite($resource, 'test_resource'); - $wrappedResource = new TestFooNorm; - $wrappedResource->foo = $resource; - // Just do something stupid with a resource/wrapped resource as argument - array_keys($wrappedResource); - } catch (\Exception $e) { - restore_error_handler(); - } - - $formatter = new NormalizerFormatter(); - $record = array('context' => array('exception' => $e)); - $result = $formatter->format($record); - - $this->assertRegExp( - '%"resource":"\[resource\] \(stream\)"%', - $result['context']['exception']['trace'][0] - ); - - if (version_compare(PHP_VERSION, '5.5.0', '>=')) { - $pattern = '%"wrappedResource":"\[object\] \(Monolog\\\\\\\\Formatter\\\\\\\\TestFooNorm: \)"%'; - } else { - $pattern = '%\\\\"foo\\\\":null%'; - } - - // Tests that the wrapped resource is ignored while encoding, only works for PHP <= 5.4 - $this->assertRegExp( - $pattern, - $result['context']['exception']['trace'][0] - ); - } - - public function testExceptionTraceDoesNotLeakCallUserFuncArgs() - { - try { - $arg = new TestInfoLeak; - call_user_func(array($this, 'throwHelper'), $arg, $dt = new \DateTime()); - } catch (\Exception $e) { - } - - $formatter = new NormalizerFormatter(); - $record = array('context' => array('exception' => $e)); - $result = $formatter->format($record); - - $this->assertSame( - '{"function":"throwHelper","class":"Monolog\\\\Formatter\\\\NormalizerFormatterTest","type":"->","args":["[object] (Monolog\\\\Formatter\\\\TestInfoLeak)","'.$dt->format('Y-m-d H:i:s').'"]}', - $result['context']['exception']['trace'][0] - ); - } - - private function throwHelper($arg) - { - throw new \RuntimeException('Thrown'); - } -} - -class TestFooNorm -{ - public $foo = 'foo'; -} - -class TestBarNorm -{ - public function __toString() - { - return 'bar'; - } -} - -class TestStreamFoo -{ - public $foo; - public $resource; - - public function __construct($resource) - { - $this->resource = $resource; - $this->foo = 'BAR'; - } - - public function __toString() - { - fseek($this->resource, 0); - - return $this->foo . ' - ' . (string) stream_get_contents($this->resource); - } -} - -class TestToStringError -{ - public function __toString() - { - throw new \RuntimeException('Could not convert to string'); - } -} - -class TestInfoLeak -{ - public function __toString() - { - return 'Sensitive information'; - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Formatter/ScalarFormatterTest.php b/vendor/monolog/monolog/tests/Monolog/Formatter/ScalarFormatterTest.php deleted file mode 100644 index b1c8fd4..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Formatter/ScalarFormatterTest.php +++ /dev/null @@ -1,110 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Formatter; - -class ScalarFormatterTest extends \PHPUnit_Framework_TestCase -{ - private $formatter; - - public function setUp() - { - $this->formatter = new ScalarFormatter(); - } - - public function buildTrace(\Exception $e) - { - $data = array(); - $trace = $e->getTrace(); - foreach ($trace as $frame) { - if (isset($frame['file'])) { - $data[] = $frame['file'].':'.$frame['line']; - } else { - $data[] = json_encode($frame); - } - } - - return $data; - } - - public function encodeJson($data) - { - if (version_compare(PHP_VERSION, '5.4.0', '>=')) { - return json_encode($data, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE); - } - - return json_encode($data); - } - - public function testFormat() - { - $exception = new \Exception('foo'); - $formatted = $this->formatter->format(array( - 'foo' => 'string', - 'bar' => 1, - 'baz' => false, - 'bam' => array(1, 2, 3), - 'bat' => array('foo' => 'bar'), - 'bap' => \DateTime::createFromFormat(\DateTime::ISO8601, '1970-01-01T00:00:00+0000'), - 'ban' => $exception, - )); - - $this->assertSame(array( - 'foo' => 'string', - 'bar' => 1, - 'baz' => false, - 'bam' => $this->encodeJson(array(1, 2, 3)), - 'bat' => $this->encodeJson(array('foo' => 'bar')), - 'bap' => '1970-01-01 00:00:00', - 'ban' => $this->encodeJson(array( - 'class' => get_class($exception), - 'message' => $exception->getMessage(), - 'code' => $exception->getCode(), - 'file' => $exception->getFile() . ':' . $exception->getLine(), - 'trace' => $this->buildTrace($exception), - )), - ), $formatted); - } - - public function testFormatWithErrorContext() - { - $context = array('file' => 'foo', 'line' => 1); - $formatted = $this->formatter->format(array( - 'context' => $context, - )); - - $this->assertSame(array( - 'context' => $this->encodeJson($context), - ), $formatted); - } - - public function testFormatWithExceptionContext() - { - $exception = new \Exception('foo'); - $formatted = $this->formatter->format(array( - 'context' => array( - 'exception' => $exception, - ), - )); - - $this->assertSame(array( - 'context' => $this->encodeJson(array( - 'exception' => array( - 'class' => get_class($exception), - 'message' => $exception->getMessage(), - 'code' => $exception->getCode(), - 'file' => $exception->getFile() . ':' . $exception->getLine(), - 'trace' => $this->buildTrace($exception), - ), - )), - ), $formatted); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Formatter/WildfireFormatterTest.php b/vendor/monolog/monolog/tests/Monolog/Formatter/WildfireFormatterTest.php deleted file mode 100644 index 52f15a3..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Formatter/WildfireFormatterTest.php +++ /dev/null @@ -1,142 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Formatter; - -use Monolog\Logger; - -class WildfireFormatterTest extends \PHPUnit_Framework_TestCase -{ - /** - * @covers Monolog\Formatter\WildfireFormatter::format - */ - public function testDefaultFormat() - { - $wildfire = new WildfireFormatter(); - $record = array( - 'level' => Logger::ERROR, - 'level_name' => 'ERROR', - 'channel' => 'meh', - 'context' => array('from' => 'logger'), - 'datetime' => new \DateTime("@0"), - 'extra' => array('ip' => '127.0.0.1'), - 'message' => 'log', - ); - - $message = $wildfire->format($record); - - $this->assertEquals( - '125|[{"Type":"ERROR","File":"","Line":"","Label":"meh"},' - .'{"message":"log","context":{"from":"logger"},"extra":{"ip":"127.0.0.1"}}]|', - $message - ); - } - - /** - * @covers Monolog\Formatter\WildfireFormatter::format - */ - public function testFormatWithFileAndLine() - { - $wildfire = new WildfireFormatter(); - $record = array( - 'level' => Logger::ERROR, - 'level_name' => 'ERROR', - 'channel' => 'meh', - 'context' => array('from' => 'logger'), - 'datetime' => new \DateTime("@0"), - 'extra' => array('ip' => '127.0.0.1', 'file' => 'test', 'line' => 14), - 'message' => 'log', - ); - - $message = $wildfire->format($record); - - $this->assertEquals( - '129|[{"Type":"ERROR","File":"test","Line":14,"Label":"meh"},' - .'{"message":"log","context":{"from":"logger"},"extra":{"ip":"127.0.0.1"}}]|', - $message - ); - } - - /** - * @covers Monolog\Formatter\WildfireFormatter::format - */ - public function testFormatWithoutContext() - { - $wildfire = new WildfireFormatter(); - $record = array( - 'level' => Logger::ERROR, - 'level_name' => 'ERROR', - 'channel' => 'meh', - 'context' => array(), - 'datetime' => new \DateTime("@0"), - 'extra' => array(), - 'message' => 'log', - ); - - $message = $wildfire->format($record); - - $this->assertEquals( - '58|[{"Type":"ERROR","File":"","Line":"","Label":"meh"},"log"]|', - $message - ); - } - - /** - * @covers Monolog\Formatter\WildfireFormatter::formatBatch - * @expectedException BadMethodCallException - */ - public function testBatchFormatThrowException() - { - $wildfire = new WildfireFormatter(); - $record = array( - 'level' => Logger::ERROR, - 'level_name' => 'ERROR', - 'channel' => 'meh', - 'context' => array(), - 'datetime' => new \DateTime("@0"), - 'extra' => array(), - 'message' => 'log', - ); - - $wildfire->formatBatch(array($record)); - } - - /** - * @covers Monolog\Formatter\WildfireFormatter::format - */ - public function testTableFormat() - { - $wildfire = new WildfireFormatter(); - $record = array( - 'level' => Logger::ERROR, - 'level_name' => 'ERROR', - 'channel' => 'table-channel', - 'context' => array( - WildfireFormatter::TABLE => array( - array('col1', 'col2', 'col3'), - array('val1', 'val2', 'val3'), - array('foo1', 'foo2', 'foo3'), - array('bar1', 'bar2', 'bar3'), - ), - ), - 'datetime' => new \DateTime("@0"), - 'extra' => array(), - 'message' => 'table-message', - ); - - $message = $wildfire->format($record); - - $this->assertEquals( - '171|[{"Type":"TABLE","File":"","Line":"","Label":"table-channel: table-message"},[["col1","col2","col3"],["val1","val2","val3"],["foo1","foo2","foo3"],["bar1","bar2","bar3"]]]|', - $message - ); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/AbstractHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/AbstractHandlerTest.php deleted file mode 100644 index 568eb9d..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/AbstractHandlerTest.php +++ /dev/null @@ -1,115 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; -use Monolog\Logger; -use Monolog\Formatter\LineFormatter; -use Monolog\Processor\WebProcessor; - -class AbstractHandlerTest extends TestCase -{ - /** - * @covers Monolog\Handler\AbstractHandler::__construct - * @covers Monolog\Handler\AbstractHandler::getLevel - * @covers Monolog\Handler\AbstractHandler::setLevel - * @covers Monolog\Handler\AbstractHandler::getBubble - * @covers Monolog\Handler\AbstractHandler::setBubble - * @covers Monolog\Handler\AbstractHandler::getFormatter - * @covers Monolog\Handler\AbstractHandler::setFormatter - */ - public function testConstructAndGetSet() - { - $handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractHandler', array(Logger::WARNING, false)); - $this->assertEquals(Logger::WARNING, $handler->getLevel()); - $this->assertEquals(false, $handler->getBubble()); - - $handler->setLevel(Logger::ERROR); - $handler->setBubble(true); - $handler->setFormatter($formatter = new LineFormatter); - $this->assertEquals(Logger::ERROR, $handler->getLevel()); - $this->assertEquals(true, $handler->getBubble()); - $this->assertSame($formatter, $handler->getFormatter()); - } - - /** - * @covers Monolog\Handler\AbstractHandler::handleBatch - */ - public function testHandleBatch() - { - $handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractHandler'); - $handler->expects($this->exactly(2)) - ->method('handle'); - $handler->handleBatch(array($this->getRecord(), $this->getRecord())); - } - - /** - * @covers Monolog\Handler\AbstractHandler::isHandling - */ - public function testIsHandling() - { - $handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractHandler', array(Logger::WARNING, false)); - $this->assertTrue($handler->isHandling($this->getRecord())); - $this->assertFalse($handler->isHandling($this->getRecord(Logger::DEBUG))); - } - - /** - * @covers Monolog\Handler\AbstractHandler::__construct - */ - public function testHandlesPsrStyleLevels() - { - $handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractHandler', array('warning', false)); - $this->assertFalse($handler->isHandling($this->getRecord(Logger::DEBUG))); - $handler->setLevel('debug'); - $this->assertTrue($handler->isHandling($this->getRecord(Logger::DEBUG))); - } - - /** - * @covers Monolog\Handler\AbstractHandler::getFormatter - * @covers Monolog\Handler\AbstractHandler::getDefaultFormatter - */ - public function testGetFormatterInitializesDefault() - { - $handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractHandler'); - $this->assertInstanceOf('Monolog\Formatter\LineFormatter', $handler->getFormatter()); - } - - /** - * @covers Monolog\Handler\AbstractHandler::pushProcessor - * @covers Monolog\Handler\AbstractHandler::popProcessor - * @expectedException LogicException - */ - public function testPushPopProcessor() - { - $logger = $this->getMockForAbstractClass('Monolog\Handler\AbstractHandler'); - $processor1 = new WebProcessor; - $processor2 = new WebProcessor; - - $logger->pushProcessor($processor1); - $logger->pushProcessor($processor2); - - $this->assertEquals($processor2, $logger->popProcessor()); - $this->assertEquals($processor1, $logger->popProcessor()); - $logger->popProcessor(); - } - - /** - * @covers Monolog\Handler\AbstractHandler::pushProcessor - * @expectedException InvalidArgumentException - */ - public function testPushProcessorWithNonCallable() - { - $handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractHandler'); - - $handler->pushProcessor(new \stdClass()); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/AbstractProcessingHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/AbstractProcessingHandlerTest.php deleted file mode 100644 index 24d4f63..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/AbstractProcessingHandlerTest.php +++ /dev/null @@ -1,80 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; -use Monolog\Logger; -use Monolog\Processor\WebProcessor; - -class AbstractProcessingHandlerTest extends TestCase -{ - /** - * @covers Monolog\Handler\AbstractProcessingHandler::handle - */ - public function testHandleLowerLevelMessage() - { - $handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler', array(Logger::WARNING, true)); - $this->assertFalse($handler->handle($this->getRecord(Logger::DEBUG))); - } - - /** - * @covers Monolog\Handler\AbstractProcessingHandler::handle - */ - public function testHandleBubbling() - { - $handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler', array(Logger::DEBUG, true)); - $this->assertFalse($handler->handle($this->getRecord())); - } - - /** - * @covers Monolog\Handler\AbstractProcessingHandler::handle - */ - public function testHandleNotBubbling() - { - $handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler', array(Logger::DEBUG, false)); - $this->assertTrue($handler->handle($this->getRecord())); - } - - /** - * @covers Monolog\Handler\AbstractProcessingHandler::handle - */ - public function testHandleIsFalseWhenNotHandled() - { - $handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler', array(Logger::WARNING, false)); - $this->assertTrue($handler->handle($this->getRecord())); - $this->assertFalse($handler->handle($this->getRecord(Logger::DEBUG))); - } - - /** - * @covers Monolog\Handler\AbstractProcessingHandler::processRecord - */ - public function testProcessRecord() - { - $handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler'); - $handler->pushProcessor(new WebProcessor(array( - 'REQUEST_URI' => '', - 'REQUEST_METHOD' => '', - 'REMOTE_ADDR' => '', - 'SERVER_NAME' => '', - 'UNIQUE_ID' => '', - ))); - $handledRecord = null; - $handler->expects($this->once()) - ->method('write') - ->will($this->returnCallback(function ($record) use (&$handledRecord) { - $handledRecord = $record; - })) - ; - $handler->handle($this->getRecord()); - $this->assertEquals(6, count($handledRecord['extra'])); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/AmqpHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/AmqpHandlerTest.php deleted file mode 100644 index 8e0e723..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/AmqpHandlerTest.php +++ /dev/null @@ -1,136 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; -use Monolog\Logger; -use PhpAmqpLib\Message\AMQPMessage; -use PhpAmqpLib\Connection\AMQPConnection; - -/** - * @covers Monolog\Handler\RotatingFileHandler - */ -class AmqpHandlerTest extends TestCase -{ - public function testHandleAmqpExt() - { - if (!class_exists('AMQPConnection') || !class_exists('AMQPExchange')) { - $this->markTestSkipped("amqp-php not installed"); - } - - if (!class_exists('AMQPChannel')) { - $this->markTestSkipped("Please update AMQP to version >= 1.0"); - } - - $messages = array(); - - $exchange = $this->getMock('AMQPExchange', array('publish', 'setName'), array(), '', false); - $exchange->expects($this->once()) - ->method('setName') - ->with('log') - ; - $exchange->expects($this->any()) - ->method('publish') - ->will($this->returnCallback(function ($message, $routing_key, $flags = 0, $attributes = array()) use (&$messages) { - $messages[] = array($message, $routing_key, $flags, $attributes); - })) - ; - - $handler = new AmqpHandler($exchange, 'log'); - - $record = $this->getRecord(Logger::WARNING, 'test', array('data' => new \stdClass, 'foo' => 34)); - - $expected = array( - array( - 'message' => 'test', - 'context' => array( - 'data' => array(), - 'foo' => 34, - ), - 'level' => 300, - 'level_name' => 'WARNING', - 'channel' => 'test', - 'extra' => array(), - ), - 'warn.test', - 0, - array( - 'delivery_mode' => 2, - 'content_type' => 'application/json', - ), - ); - - $handler->handle($record); - - $this->assertCount(1, $messages); - $messages[0][0] = json_decode($messages[0][0], true); - unset($messages[0][0]['datetime']); - $this->assertEquals($expected, $messages[0]); - } - - public function testHandlePhpAmqpLib() - { - if (!class_exists('PhpAmqpLib\Connection\AMQPConnection')) { - $this->markTestSkipped("php-amqplib not installed"); - } - - $messages = array(); - - $exchange = $this->getMock('PhpAmqpLib\Channel\AMQPChannel', array('basic_publish', '__destruct'), array(), '', false); - - $exchange->expects($this->any()) - ->method('basic_publish') - ->will($this->returnCallback(function (AMQPMessage $msg, $exchange = "", $routing_key = "", $mandatory = false, $immediate = false, $ticket = null) use (&$messages) { - $messages[] = array($msg, $exchange, $routing_key, $mandatory, $immediate, $ticket); - })) - ; - - $handler = new AmqpHandler($exchange, 'log'); - - $record = $this->getRecord(Logger::WARNING, 'test', array('data' => new \stdClass, 'foo' => 34)); - - $expected = array( - array( - 'message' => 'test', - 'context' => array( - 'data' => array(), - 'foo' => 34, - ), - 'level' => 300, - 'level_name' => 'WARNING', - 'channel' => 'test', - 'extra' => array(), - ), - 'log', - 'warn.test', - false, - false, - null, - array( - 'delivery_mode' => 2, - 'content_type' => 'application/json', - ), - ); - - $handler->handle($record); - - $this->assertCount(1, $messages); - - /* @var $msg AMQPMessage */ - $msg = $messages[0][0]; - $messages[0][0] = json_decode($msg->body, true); - $messages[0][] = $msg->get_properties(); - unset($messages[0][0]['datetime']); - - $this->assertEquals($expected, $messages[0]); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/BrowserConsoleHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/BrowserConsoleHandlerTest.php deleted file mode 100644 index ffe45da..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/BrowserConsoleHandlerTest.php +++ /dev/null @@ -1,130 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; -use Monolog\Logger; - -/** - * @covers Monolog\Handler\BrowserConsoleHandlerTest - */ -class BrowserConsoleHandlerTest extends TestCase -{ - protected function setUp() - { - BrowserConsoleHandler::resetStatic(); - } - - protected function generateScript() - { - $reflMethod = new \ReflectionMethod('Monolog\Handler\BrowserConsoleHandler', 'generateScript'); - $reflMethod->setAccessible(true); - - return $reflMethod->invoke(null); - } - - public function testStyling() - { - $handler = new BrowserConsoleHandler(); - $handler->setFormatter($this->getIdentityFormatter()); - - $handler->handle($this->getRecord(Logger::DEBUG, 'foo[[bar]]{color: red}')); - - $expected = <<assertEquals($expected, $this->generateScript()); - } - - public function testEscaping() - { - $handler = new BrowserConsoleHandler(); - $handler->setFormatter($this->getIdentityFormatter()); - - $handler->handle($this->getRecord(Logger::DEBUG, "[foo] [[\"bar\n[baz]\"]]{color: red}")); - - $expected = <<assertEquals($expected, $this->generateScript()); - } - - public function testAutolabel() - { - $handler = new BrowserConsoleHandler(); - $handler->setFormatter($this->getIdentityFormatter()); - - $handler->handle($this->getRecord(Logger::DEBUG, '[[foo]]{macro: autolabel}')); - $handler->handle($this->getRecord(Logger::DEBUG, '[[bar]]{macro: autolabel}')); - $handler->handle($this->getRecord(Logger::DEBUG, '[[foo]]{macro: autolabel}')); - - $expected = <<assertEquals($expected, $this->generateScript()); - } - - public function testContext() - { - $handler = new BrowserConsoleHandler(); - $handler->setFormatter($this->getIdentityFormatter()); - - $handler->handle($this->getRecord(Logger::DEBUG, 'test', array('foo' => 'bar'))); - - $expected = <<assertEquals($expected, $this->generateScript()); - } - - public function testConcurrentHandlers() - { - $handler1 = new BrowserConsoleHandler(); - $handler1->setFormatter($this->getIdentityFormatter()); - - $handler2 = new BrowserConsoleHandler(); - $handler2->setFormatter($this->getIdentityFormatter()); - - $handler1->handle($this->getRecord(Logger::DEBUG, 'test1')); - $handler2->handle($this->getRecord(Logger::DEBUG, 'test2')); - $handler1->handle($this->getRecord(Logger::DEBUG, 'test3')); - $handler2->handle($this->getRecord(Logger::DEBUG, 'test4')); - - $expected = <<assertEquals($expected, $this->generateScript()); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/BufferHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/BufferHandlerTest.php deleted file mode 100644 index da8b3c3..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/BufferHandlerTest.php +++ /dev/null @@ -1,158 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; -use Monolog\Logger; - -class BufferHandlerTest extends TestCase -{ - private $shutdownCheckHandler; - - /** - * @covers Monolog\Handler\BufferHandler::__construct - * @covers Monolog\Handler\BufferHandler::handle - * @covers Monolog\Handler\BufferHandler::close - */ - public function testHandleBuffers() - { - $test = new TestHandler(); - $handler = new BufferHandler($test); - $handler->handle($this->getRecord(Logger::DEBUG)); - $handler->handle($this->getRecord(Logger::INFO)); - $this->assertFalse($test->hasDebugRecords()); - $this->assertFalse($test->hasInfoRecords()); - $handler->close(); - $this->assertTrue($test->hasInfoRecords()); - $this->assertTrue(count($test->getRecords()) === 2); - } - - /** - * @covers Monolog\Handler\BufferHandler::close - * @covers Monolog\Handler\BufferHandler::flush - */ - public function testPropagatesRecordsAtEndOfRequest() - { - $test = new TestHandler(); - $handler = new BufferHandler($test); - $handler->handle($this->getRecord(Logger::WARNING)); - $handler->handle($this->getRecord(Logger::DEBUG)); - $this->shutdownCheckHandler = $test; - register_shutdown_function(array($this, 'checkPropagation')); - } - - public function checkPropagation() - { - if (!$this->shutdownCheckHandler->hasWarningRecords() || !$this->shutdownCheckHandler->hasDebugRecords()) { - echo '!!! BufferHandlerTest::testPropagatesRecordsAtEndOfRequest failed to verify that the messages have been propagated' . PHP_EOL; - exit(1); - } - } - - /** - * @covers Monolog\Handler\BufferHandler::handle - */ - public function testHandleBufferLimit() - { - $test = new TestHandler(); - $handler = new BufferHandler($test, 2); - $handler->handle($this->getRecord(Logger::DEBUG)); - $handler->handle($this->getRecord(Logger::DEBUG)); - $handler->handle($this->getRecord(Logger::INFO)); - $handler->handle($this->getRecord(Logger::WARNING)); - $handler->close(); - $this->assertTrue($test->hasWarningRecords()); - $this->assertTrue($test->hasInfoRecords()); - $this->assertFalse($test->hasDebugRecords()); - } - - /** - * @covers Monolog\Handler\BufferHandler::handle - */ - public function testHandleBufferLimitWithFlushOnOverflow() - { - $test = new TestHandler(); - $handler = new BufferHandler($test, 3, Logger::DEBUG, true, true); - - // send two records - $handler->handle($this->getRecord(Logger::DEBUG)); - $handler->handle($this->getRecord(Logger::DEBUG)); - $handler->handle($this->getRecord(Logger::DEBUG)); - $this->assertFalse($test->hasDebugRecords()); - $this->assertCount(0, $test->getRecords()); - - // overflow - $handler->handle($this->getRecord(Logger::INFO)); - $this->assertTrue($test->hasDebugRecords()); - $this->assertCount(3, $test->getRecords()); - - // should buffer again - $handler->handle($this->getRecord(Logger::WARNING)); - $this->assertCount(3, $test->getRecords()); - - $handler->close(); - $this->assertCount(5, $test->getRecords()); - $this->assertTrue($test->hasWarningRecords()); - $this->assertTrue($test->hasInfoRecords()); - } - - /** - * @covers Monolog\Handler\BufferHandler::handle - */ - public function testHandleLevel() - { - $test = new TestHandler(); - $handler = new BufferHandler($test, 0, Logger::INFO); - $handler->handle($this->getRecord(Logger::DEBUG)); - $handler->handle($this->getRecord(Logger::INFO)); - $handler->handle($this->getRecord(Logger::WARNING)); - $handler->handle($this->getRecord(Logger::DEBUG)); - $handler->close(); - $this->assertTrue($test->hasWarningRecords()); - $this->assertTrue($test->hasInfoRecords()); - $this->assertFalse($test->hasDebugRecords()); - } - - /** - * @covers Monolog\Handler\BufferHandler::flush - */ - public function testFlush() - { - $test = new TestHandler(); - $handler = new BufferHandler($test, 0); - $handler->handle($this->getRecord(Logger::DEBUG)); - $handler->handle($this->getRecord(Logger::INFO)); - $handler->flush(); - $this->assertTrue($test->hasInfoRecords()); - $this->assertTrue($test->hasDebugRecords()); - $this->assertFalse($test->hasWarningRecords()); - } - - /** - * @covers Monolog\Handler\BufferHandler::handle - */ - public function testHandleUsesProcessors() - { - $test = new TestHandler(); - $handler = new BufferHandler($test); - $handler->pushProcessor(function ($record) { - $record['extra']['foo'] = true; - - return $record; - }); - $handler->handle($this->getRecord(Logger::WARNING)); - $handler->flush(); - $this->assertTrue($test->hasWarningRecords()); - $records = $test->getRecords(); - $this->assertTrue($records[0]['extra']['foo']); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/ChromePHPHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/ChromePHPHandlerTest.php deleted file mode 100644 index 421cc49..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/ChromePHPHandlerTest.php +++ /dev/null @@ -1,156 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; -use Monolog\Logger; - -/** - * @covers Monolog\Handler\ChromePHPHandler - */ -class ChromePHPHandlerTest extends TestCase -{ - protected function setUp() - { - TestChromePHPHandler::resetStatic(); - $_SERVER['HTTP_USER_AGENT'] = 'Monolog Test; Chrome/1.0'; - } - - /** - * @dataProvider agentsProvider - */ - public function testHeaders($agent) - { - $_SERVER['HTTP_USER_AGENT'] = $agent; - - $handler = new TestChromePHPHandler(); - $handler->setFormatter($this->getIdentityFormatter()); - $handler->handle($this->getRecord(Logger::DEBUG)); - $handler->handle($this->getRecord(Logger::WARNING)); - - $expected = array( - 'X-ChromeLogger-Data' => base64_encode(utf8_encode(json_encode(array( - 'version' => ChromePHPHandler::VERSION, - 'columns' => array('label', 'log', 'backtrace', 'type'), - 'rows' => array( - 'test', - 'test', - ), - 'request_uri' => '', - )))), - ); - - $this->assertEquals($expected, $handler->getHeaders()); - } - - public static function agentsProvider() - { - return array( - array('Monolog Test; Chrome/1.0'), - array('Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:52.0) Gecko/20100101 Firefox/52.0'), - array('Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Ubuntu Chromium/56.0.2924.76 Chrome/56.0.2924.76 Safari/537.36'), - array('Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) HeadlessChrome Safari/537.36'), - ); - } - - public function testHeadersOverflow() - { - $handler = new TestChromePHPHandler(); - $handler->handle($this->getRecord(Logger::DEBUG)); - $handler->handle($this->getRecord(Logger::WARNING, str_repeat('a', 150 * 1024))); - - // overflow chrome headers limit - $handler->handle($this->getRecord(Logger::WARNING, str_repeat('a', 100 * 1024))); - - $expected = array( - 'X-ChromeLogger-Data' => base64_encode(utf8_encode(json_encode(array( - 'version' => ChromePHPHandler::VERSION, - 'columns' => array('label', 'log', 'backtrace', 'type'), - 'rows' => array( - array( - 'test', - 'test', - 'unknown', - 'log', - ), - array( - 'test', - str_repeat('a', 150 * 1024), - 'unknown', - 'warn', - ), - array( - 'monolog', - 'Incomplete logs, chrome header size limit reached', - 'unknown', - 'warn', - ), - ), - 'request_uri' => '', - )))), - ); - - $this->assertEquals($expected, $handler->getHeaders()); - } - - public function testConcurrentHandlers() - { - $handler = new TestChromePHPHandler(); - $handler->setFormatter($this->getIdentityFormatter()); - $handler->handle($this->getRecord(Logger::DEBUG)); - $handler->handle($this->getRecord(Logger::WARNING)); - - $handler2 = new TestChromePHPHandler(); - $handler2->setFormatter($this->getIdentityFormatter()); - $handler2->handle($this->getRecord(Logger::DEBUG)); - $handler2->handle($this->getRecord(Logger::WARNING)); - - $expected = array( - 'X-ChromeLogger-Data' => base64_encode(utf8_encode(json_encode(array( - 'version' => ChromePHPHandler::VERSION, - 'columns' => array('label', 'log', 'backtrace', 'type'), - 'rows' => array( - 'test', - 'test', - 'test', - 'test', - ), - 'request_uri' => '', - )))), - ); - - $this->assertEquals($expected, $handler2->getHeaders()); - } -} - -class TestChromePHPHandler extends ChromePHPHandler -{ - protected $headers = array(); - - public static function resetStatic() - { - self::$initialized = false; - self::$overflowed = false; - self::$sendHeaders = true; - self::$json['rows'] = array(); - } - - protected function sendHeader($header, $content) - { - $this->headers[$header] = $content; - } - - public function getHeaders() - { - return $this->headers; - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/CouchDBHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/CouchDBHandlerTest.php deleted file mode 100644 index 9fc4b38..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/CouchDBHandlerTest.php +++ /dev/null @@ -1,31 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; -use Monolog\Logger; - -class CouchDBHandlerTest extends TestCase -{ - public function testHandle() - { - $record = $this->getRecord(Logger::WARNING, 'test', array('data' => new \stdClass, 'foo' => 34)); - - $handler = new CouchDBHandler(); - - try { - $handler->handle($record); - } catch (\RuntimeException $e) { - $this->markTestSkipped('Could not connect to couchdb server on http://localhost:5984'); - } - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/DeduplicationHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/DeduplicationHandlerTest.php deleted file mode 100644 index e2aff86..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/DeduplicationHandlerTest.php +++ /dev/null @@ -1,165 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; -use Monolog\Logger; - -class DeduplicationHandlerTest extends TestCase -{ - /** - * @covers Monolog\Handler\DeduplicationHandler::flush - */ - public function testFlushPassthruIfAllRecordsUnderTrigger() - { - $test = new TestHandler(); - @unlink(sys_get_temp_dir().'/monolog_dedup.log'); - $handler = new DeduplicationHandler($test, sys_get_temp_dir().'/monolog_dedup.log', 0); - - $handler->handle($this->getRecord(Logger::DEBUG)); - $handler->handle($this->getRecord(Logger::INFO)); - - $handler->flush(); - - $this->assertTrue($test->hasInfoRecords()); - $this->assertTrue($test->hasDebugRecords()); - $this->assertFalse($test->hasWarningRecords()); - } - - /** - * @covers Monolog\Handler\DeduplicationHandler::flush - * @covers Monolog\Handler\DeduplicationHandler::appendRecord - */ - public function testFlushPassthruIfEmptyLog() - { - $test = new TestHandler(); - @unlink(sys_get_temp_dir().'/monolog_dedup.log'); - $handler = new DeduplicationHandler($test, sys_get_temp_dir().'/monolog_dedup.log', 0); - - $handler->handle($this->getRecord(Logger::ERROR, 'Foo:bar')); - $handler->handle($this->getRecord(Logger::CRITICAL, "Foo\nbar")); - - $handler->flush(); - - $this->assertTrue($test->hasErrorRecords()); - $this->assertTrue($test->hasCriticalRecords()); - $this->assertFalse($test->hasWarningRecords()); - } - - /** - * @covers Monolog\Handler\DeduplicationHandler::flush - * @covers Monolog\Handler\DeduplicationHandler::appendRecord - * @covers Monolog\Handler\DeduplicationHandler::isDuplicate - * @depends testFlushPassthruIfEmptyLog - */ - public function testFlushSkipsIfLogExists() - { - $test = new TestHandler(); - $handler = new DeduplicationHandler($test, sys_get_temp_dir().'/monolog_dedup.log', 0); - - $handler->handle($this->getRecord(Logger::ERROR, 'Foo:bar')); - $handler->handle($this->getRecord(Logger::CRITICAL, "Foo\nbar")); - - $handler->flush(); - - $this->assertFalse($test->hasErrorRecords()); - $this->assertFalse($test->hasCriticalRecords()); - $this->assertFalse($test->hasWarningRecords()); - } - - /** - * @covers Monolog\Handler\DeduplicationHandler::flush - * @covers Monolog\Handler\DeduplicationHandler::appendRecord - * @covers Monolog\Handler\DeduplicationHandler::isDuplicate - * @depends testFlushPassthruIfEmptyLog - */ - public function testFlushPassthruIfLogTooOld() - { - $test = new TestHandler(); - $handler = new DeduplicationHandler($test, sys_get_temp_dir().'/monolog_dedup.log', 0); - - $record = $this->getRecord(Logger::ERROR); - $record['datetime']->modify('+62seconds'); - $handler->handle($record); - $record = $this->getRecord(Logger::CRITICAL); - $record['datetime']->modify('+62seconds'); - $handler->handle($record); - - $handler->flush(); - - $this->assertTrue($test->hasErrorRecords()); - $this->assertTrue($test->hasCriticalRecords()); - $this->assertFalse($test->hasWarningRecords()); - } - - /** - * @covers Monolog\Handler\DeduplicationHandler::flush - * @covers Monolog\Handler\DeduplicationHandler::appendRecord - * @covers Monolog\Handler\DeduplicationHandler::isDuplicate - * @covers Monolog\Handler\DeduplicationHandler::collectLogs - */ - public function testGcOldLogs() - { - $test = new TestHandler(); - @unlink(sys_get_temp_dir().'/monolog_dedup.log'); - $handler = new DeduplicationHandler($test, sys_get_temp_dir().'/monolog_dedup.log', 0); - - // handle two records from yesterday, and one recent - $record = $this->getRecord(Logger::ERROR); - $record['datetime']->modify('-1day -10seconds'); - $handler->handle($record); - $record2 = $this->getRecord(Logger::CRITICAL); - $record2['datetime']->modify('-1day -10seconds'); - $handler->handle($record2); - $record3 = $this->getRecord(Logger::CRITICAL); - $record3['datetime']->modify('-30seconds'); - $handler->handle($record3); - - // log is written as none of them are duplicate - $handler->flush(); - $this->assertSame( - $record['datetime']->getTimestamp() . ":ERROR:test\n" . - $record2['datetime']->getTimestamp() . ":CRITICAL:test\n" . - $record3['datetime']->getTimestamp() . ":CRITICAL:test\n", - file_get_contents(sys_get_temp_dir() . '/monolog_dedup.log') - ); - $this->assertTrue($test->hasErrorRecords()); - $this->assertTrue($test->hasCriticalRecords()); - $this->assertFalse($test->hasWarningRecords()); - - // clear test handler - $test->clear(); - $this->assertFalse($test->hasErrorRecords()); - $this->assertFalse($test->hasCriticalRecords()); - - // log new records, duplicate log gets GC'd at the end of this flush call - $handler->handle($record = $this->getRecord(Logger::ERROR)); - $handler->handle($record2 = $this->getRecord(Logger::CRITICAL)); - $handler->flush(); - - // log should now contain the new errors and the previous one that was recent enough - $this->assertSame( - $record3['datetime']->getTimestamp() . ":CRITICAL:test\n" . - $record['datetime']->getTimestamp() . ":ERROR:test\n" . - $record2['datetime']->getTimestamp() . ":CRITICAL:test\n", - file_get_contents(sys_get_temp_dir() . '/monolog_dedup.log') - ); - $this->assertTrue($test->hasErrorRecords()); - $this->assertTrue($test->hasCriticalRecords()); - $this->assertFalse($test->hasWarningRecords()); - } - - public static function tearDownAfterClass() - { - @unlink(sys_get_temp_dir().'/monolog_dedup.log'); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/DoctrineCouchDBHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/DoctrineCouchDBHandlerTest.php deleted file mode 100644 index d67da90..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/DoctrineCouchDBHandlerTest.php +++ /dev/null @@ -1,52 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; -use Monolog\Logger; - -class DoctrineCouchDBHandlerTest extends TestCase -{ - protected function setup() - { - if (!class_exists('Doctrine\CouchDB\CouchDBClient')) { - $this->markTestSkipped('The "doctrine/couchdb" package is not installed'); - } - } - - public function testHandle() - { - $client = $this->getMockBuilder('Doctrine\\CouchDB\\CouchDBClient') - ->setMethods(array('postDocument')) - ->disableOriginalConstructor() - ->getMock(); - - $record = $this->getRecord(Logger::WARNING, 'test', array('data' => new \stdClass, 'foo' => 34)); - - $expected = array( - 'message' => 'test', - 'context' => array('data' => '[object] (stdClass: {})', 'foo' => 34), - 'level' => Logger::WARNING, - 'level_name' => 'WARNING', - 'channel' => 'test', - 'datetime' => $record['datetime']->format('Y-m-d H:i:s'), - 'extra' => array(), - ); - - $client->expects($this->once()) - ->method('postDocument') - ->with($expected); - - $handler = new DoctrineCouchDBHandler($client); - $handler->handle($record); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/DynamoDbHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/DynamoDbHandlerTest.php deleted file mode 100644 index 2e6c348..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/DynamoDbHandlerTest.php +++ /dev/null @@ -1,82 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; - -class DynamoDbHandlerTest extends TestCase -{ - private $client; - - public function setUp() - { - if (!class_exists('Aws\DynamoDb\DynamoDbClient')) { - $this->markTestSkipped('aws/aws-sdk-php not installed'); - } - - $this->client = $this->getMockBuilder('Aws\DynamoDb\DynamoDbClient') - ->setMethods(array('formatAttributes', '__call')) - ->disableOriginalConstructor()->getMock(); - } - - public function testConstruct() - { - $this->assertInstanceOf('Monolog\Handler\DynamoDbHandler', new DynamoDbHandler($this->client, 'foo')); - } - - public function testInterface() - { - $this->assertInstanceOf('Monolog\Handler\HandlerInterface', new DynamoDbHandler($this->client, 'foo')); - } - - public function testGetFormatter() - { - $handler = new DynamoDbHandler($this->client, 'foo'); - $this->assertInstanceOf('Monolog\Formatter\ScalarFormatter', $handler->getFormatter()); - } - - public function testHandle() - { - $record = $this->getRecord(); - $formatter = $this->getMock('Monolog\Formatter\FormatterInterface'); - $formatted = array('foo' => 1, 'bar' => 2); - $handler = new DynamoDbHandler($this->client, 'foo'); - $handler->setFormatter($formatter); - - $isV3 = defined('Aws\Sdk::VERSION') && version_compare(\Aws\Sdk::VERSION, '3.0', '>='); - if ($isV3) { - $expFormatted = array('foo' => array('N' => 1), 'bar' => array('N' => 2)); - } else { - $expFormatted = $formatted; - } - - $formatter - ->expects($this->once()) - ->method('format') - ->with($record) - ->will($this->returnValue($formatted)); - $this->client - ->expects($isV3 ? $this->never() : $this->once()) - ->method('formatAttributes') - ->with($this->isType('array')) - ->will($this->returnValue($formatted)); - $this->client - ->expects($this->once()) - ->method('__call') - ->with('putItem', array(array( - 'TableName' => 'foo', - 'Item' => $expFormatted, - ))); - - $handler->handle($record); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/ElasticSearchHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/ElasticSearchHandlerTest.php deleted file mode 100644 index 1687074..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/ElasticSearchHandlerTest.php +++ /dev/null @@ -1,239 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\Formatter\ElasticaFormatter; -use Monolog\Formatter\NormalizerFormatter; -use Monolog\TestCase; -use Monolog\Logger; -use Elastica\Client; -use Elastica\Request; -use Elastica\Response; - -class ElasticSearchHandlerTest extends TestCase -{ - /** - * @var Client mock - */ - protected $client; - - /** - * @var array Default handler options - */ - protected $options = array( - 'index' => 'my_index', - 'type' => 'doc_type', - ); - - public function setUp() - { - // Elastica lib required - if (!class_exists("Elastica\Client")) { - $this->markTestSkipped("ruflin/elastica not installed"); - } - - // base mock Elastica Client object - $this->client = $this->getMockBuilder('Elastica\Client') - ->setMethods(array('addDocuments')) - ->disableOriginalConstructor() - ->getMock(); - } - - /** - * @covers Monolog\Handler\ElasticSearchHandler::write - * @covers Monolog\Handler\ElasticSearchHandler::handleBatch - * @covers Monolog\Handler\ElasticSearchHandler::bulkSend - * @covers Monolog\Handler\ElasticSearchHandler::getDefaultFormatter - */ - public function testHandle() - { - // log message - $msg = array( - 'level' => Logger::ERROR, - 'level_name' => 'ERROR', - 'channel' => 'meh', - 'context' => array('foo' => 7, 'bar', 'class' => new \stdClass), - 'datetime' => new \DateTime("@0"), - 'extra' => array(), - 'message' => 'log', - ); - - // format expected result - $formatter = new ElasticaFormatter($this->options['index'], $this->options['type']); - $expected = array($formatter->format($msg)); - - // setup ES client mock - $this->client->expects($this->any()) - ->method('addDocuments') - ->with($expected); - - // perform tests - $handler = new ElasticSearchHandler($this->client, $this->options); - $handler->handle($msg); - $handler->handleBatch(array($msg)); - } - - /** - * @covers Monolog\Handler\ElasticSearchHandler::setFormatter - */ - public function testSetFormatter() - { - $handler = new ElasticSearchHandler($this->client); - $formatter = new ElasticaFormatter('index_new', 'type_new'); - $handler->setFormatter($formatter); - $this->assertInstanceOf('Monolog\Formatter\ElasticaFormatter', $handler->getFormatter()); - $this->assertEquals('index_new', $handler->getFormatter()->getIndex()); - $this->assertEquals('type_new', $handler->getFormatter()->getType()); - } - - /** - * @covers Monolog\Handler\ElasticSearchHandler::setFormatter - * @expectedException InvalidArgumentException - * @expectedExceptionMessage ElasticSearchHandler is only compatible with ElasticaFormatter - */ - public function testSetFormatterInvalid() - { - $handler = new ElasticSearchHandler($this->client); - $formatter = new NormalizerFormatter(); - $handler->setFormatter($formatter); - } - - /** - * @covers Monolog\Handler\ElasticSearchHandler::__construct - * @covers Monolog\Handler\ElasticSearchHandler::getOptions - */ - public function testOptions() - { - $expected = array( - 'index' => $this->options['index'], - 'type' => $this->options['type'], - 'ignore_error' => false, - ); - $handler = new ElasticSearchHandler($this->client, $this->options); - $this->assertEquals($expected, $handler->getOptions()); - } - - /** - * @covers Monolog\Handler\ElasticSearchHandler::bulkSend - * @dataProvider providerTestConnectionErrors - */ - public function testConnectionErrors($ignore, $expectedError) - { - $clientOpts = array('host' => '127.0.0.1', 'port' => 1); - $client = new Client($clientOpts); - $handlerOpts = array('ignore_error' => $ignore); - $handler = new ElasticSearchHandler($client, $handlerOpts); - - if ($expectedError) { - $this->setExpectedException($expectedError[0], $expectedError[1]); - $handler->handle($this->getRecord()); - } else { - $this->assertFalse($handler->handle($this->getRecord())); - } - } - - /** - * @return array - */ - public function providerTestConnectionErrors() - { - return array( - array(false, array('RuntimeException', 'Error sending messages to Elasticsearch')), - array(true, false), - ); - } - - /** - * Integration test using localhost Elastic Search server - * - * @covers Monolog\Handler\ElasticSearchHandler::__construct - * @covers Monolog\Handler\ElasticSearchHandler::handleBatch - * @covers Monolog\Handler\ElasticSearchHandler::bulkSend - * @covers Monolog\Handler\ElasticSearchHandler::getDefaultFormatter - */ - public function testHandleIntegration() - { - $msg = array( - 'level' => Logger::ERROR, - 'level_name' => 'ERROR', - 'channel' => 'meh', - 'context' => array('foo' => 7, 'bar', 'class' => new \stdClass), - 'datetime' => new \DateTime("@0"), - 'extra' => array(), - 'message' => 'log', - ); - - $expected = $msg; - $expected['datetime'] = $msg['datetime']->format(\DateTime::ISO8601); - $expected['context'] = array( - 'class' => '[object] (stdClass: {})', - 'foo' => 7, - 0 => 'bar', - ); - - $client = new Client(); - $handler = new ElasticSearchHandler($client, $this->options); - try { - $handler->handleBatch(array($msg)); - } catch (\RuntimeException $e) { - $this->markTestSkipped("Cannot connect to Elastic Search server on localhost"); - } - - // check document id from ES server response - $documentId = $this->getCreatedDocId($client->getLastResponse()); - $this->assertNotEmpty($documentId, 'No elastic document id received'); - - // retrieve document source from ES and validate - $document = $this->getDocSourceFromElastic( - $client, - $this->options['index'], - $this->options['type'], - $documentId - ); - $this->assertEquals($expected, $document); - - // remove test index from ES - $client->request("/{$this->options['index']}", Request::DELETE); - } - - /** - * Return last created document id from ES response - * @param Response $response Elastica Response object - * @return string|null - */ - protected function getCreatedDocId(Response $response) - { - $data = $response->getData(); - if (!empty($data['items'][0]['create']['_id'])) { - return $data['items'][0]['create']['_id']; - } - } - - /** - * Retrieve document by id from Elasticsearch - * @param Client $client Elastica client - * @param string $index - * @param string $type - * @param string $documentId - * @return array - */ - protected function getDocSourceFromElastic(Client $client, $index, $type, $documentId) - { - $resp = $client->request("/{$index}/{$type}/{$documentId}", Request::GET); - $data = $resp->getData(); - if (!empty($data['_source'])) { - return $data['_source']; - } - - return array(); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/ErrorLogHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/ErrorLogHandlerTest.php deleted file mode 100644 index 99785cb..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/ErrorLogHandlerTest.php +++ /dev/null @@ -1,66 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; -use Monolog\Logger; -use Monolog\Formatter\LineFormatter; - -function error_log() -{ - $GLOBALS['error_log'][] = func_get_args(); -} - -class ErrorLogHandlerTest extends TestCase -{ - protected function setUp() - { - $GLOBALS['error_log'] = array(); - } - - /** - * @covers Monolog\Handler\ErrorLogHandler::__construct - * @expectedException InvalidArgumentException - * @expectedExceptionMessage The given message type "42" is not supported - */ - public function testShouldNotAcceptAnInvalidTypeOnContructor() - { - new ErrorLogHandler(42); - } - - /** - * @covers Monolog\Handler\ErrorLogHandler::write - */ - public function testShouldLogMessagesUsingErrorLogFuncion() - { - $type = ErrorLogHandler::OPERATING_SYSTEM; - $handler = new ErrorLogHandler($type); - $handler->setFormatter(new LineFormatter('%channel%.%level_name%: %message% %context% %extra%', null, true)); - $handler->handle($this->getRecord(Logger::ERROR, "Foo\nBar\r\n\r\nBaz")); - - $this->assertSame("test.ERROR: Foo\nBar\r\n\r\nBaz [] []", $GLOBALS['error_log'][0][0]); - $this->assertSame($GLOBALS['error_log'][0][1], $type); - - $handler = new ErrorLogHandler($type, Logger::DEBUG, true, true); - $handler->setFormatter(new LineFormatter(null, null, true)); - $handler->handle($this->getRecord(Logger::ERROR, "Foo\nBar\r\n\r\nBaz")); - - $this->assertStringMatchesFormat('[%s] test.ERROR: Foo', $GLOBALS['error_log'][1][0]); - $this->assertSame($GLOBALS['error_log'][1][1], $type); - - $this->assertStringMatchesFormat('Bar', $GLOBALS['error_log'][2][0]); - $this->assertSame($GLOBALS['error_log'][2][1], $type); - - $this->assertStringMatchesFormat('Baz [] []', $GLOBALS['error_log'][3][0]); - $this->assertSame($GLOBALS['error_log'][3][1], $type); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/FilterHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/FilterHandlerTest.php deleted file mode 100644 index 31b7686..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/FilterHandlerTest.php +++ /dev/null @@ -1,170 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\Logger; -use Monolog\TestCase; - -class FilterHandlerTest extends TestCase -{ - /** - * @covers Monolog\Handler\FilterHandler::isHandling - */ - public function testIsHandling() - { - $test = new TestHandler(); - $handler = new FilterHandler($test, Logger::INFO, Logger::NOTICE); - $this->assertFalse($handler->isHandling($this->getRecord(Logger::DEBUG))); - $this->assertTrue($handler->isHandling($this->getRecord(Logger::INFO))); - $this->assertTrue($handler->isHandling($this->getRecord(Logger::NOTICE))); - $this->assertFalse($handler->isHandling($this->getRecord(Logger::WARNING))); - $this->assertFalse($handler->isHandling($this->getRecord(Logger::ERROR))); - $this->assertFalse($handler->isHandling($this->getRecord(Logger::CRITICAL))); - $this->assertFalse($handler->isHandling($this->getRecord(Logger::ALERT))); - $this->assertFalse($handler->isHandling($this->getRecord(Logger::EMERGENCY))); - } - - /** - * @covers Monolog\Handler\FilterHandler::handle - * @covers Monolog\Handler\FilterHandler::setAcceptedLevels - * @covers Monolog\Handler\FilterHandler::isHandling - */ - public function testHandleProcessOnlyNeededLevels() - { - $test = new TestHandler(); - $handler = new FilterHandler($test, Logger::INFO, Logger::NOTICE); - - $handler->handle($this->getRecord(Logger::DEBUG)); - $this->assertFalse($test->hasDebugRecords()); - - $handler->handle($this->getRecord(Logger::INFO)); - $this->assertTrue($test->hasInfoRecords()); - $handler->handle($this->getRecord(Logger::NOTICE)); - $this->assertTrue($test->hasNoticeRecords()); - - $handler->handle($this->getRecord(Logger::WARNING)); - $this->assertFalse($test->hasWarningRecords()); - $handler->handle($this->getRecord(Logger::ERROR)); - $this->assertFalse($test->hasErrorRecords()); - $handler->handle($this->getRecord(Logger::CRITICAL)); - $this->assertFalse($test->hasCriticalRecords()); - $handler->handle($this->getRecord(Logger::ALERT)); - $this->assertFalse($test->hasAlertRecords()); - $handler->handle($this->getRecord(Logger::EMERGENCY)); - $this->assertFalse($test->hasEmergencyRecords()); - - $test = new TestHandler(); - $handler = new FilterHandler($test, array(Logger::INFO, Logger::ERROR)); - - $handler->handle($this->getRecord(Logger::DEBUG)); - $this->assertFalse($test->hasDebugRecords()); - $handler->handle($this->getRecord(Logger::INFO)); - $this->assertTrue($test->hasInfoRecords()); - $handler->handle($this->getRecord(Logger::NOTICE)); - $this->assertFalse($test->hasNoticeRecords()); - $handler->handle($this->getRecord(Logger::ERROR)); - $this->assertTrue($test->hasErrorRecords()); - $handler->handle($this->getRecord(Logger::CRITICAL)); - $this->assertFalse($test->hasCriticalRecords()); - } - - /** - * @covers Monolog\Handler\FilterHandler::setAcceptedLevels - * @covers Monolog\Handler\FilterHandler::getAcceptedLevels - */ - public function testAcceptedLevelApi() - { - $test = new TestHandler(); - $handler = new FilterHandler($test); - - $levels = array(Logger::INFO, Logger::ERROR); - $handler->setAcceptedLevels($levels); - $this->assertSame($levels, $handler->getAcceptedLevels()); - - $handler->setAcceptedLevels(array('info', 'error')); - $this->assertSame($levels, $handler->getAcceptedLevels()); - - $levels = array(Logger::CRITICAL, Logger::ALERT, Logger::EMERGENCY); - $handler->setAcceptedLevels(Logger::CRITICAL, Logger::EMERGENCY); - $this->assertSame($levels, $handler->getAcceptedLevels()); - - $handler->setAcceptedLevels('critical', 'emergency'); - $this->assertSame($levels, $handler->getAcceptedLevels()); - } - - /** - * @covers Monolog\Handler\FilterHandler::handle - */ - public function testHandleUsesProcessors() - { - $test = new TestHandler(); - $handler = new FilterHandler($test, Logger::DEBUG, Logger::EMERGENCY); - $handler->pushProcessor( - function ($record) { - $record['extra']['foo'] = true; - - return $record; - } - ); - $handler->handle($this->getRecord(Logger::WARNING)); - $this->assertTrue($test->hasWarningRecords()); - $records = $test->getRecords(); - $this->assertTrue($records[0]['extra']['foo']); - } - - /** - * @covers Monolog\Handler\FilterHandler::handle - */ - public function testHandleRespectsBubble() - { - $test = new TestHandler(); - - $handler = new FilterHandler($test, Logger::INFO, Logger::NOTICE, false); - $this->assertTrue($handler->handle($this->getRecord(Logger::INFO))); - $this->assertFalse($handler->handle($this->getRecord(Logger::WARNING))); - - $handler = new FilterHandler($test, Logger::INFO, Logger::NOTICE, true); - $this->assertFalse($handler->handle($this->getRecord(Logger::INFO))); - $this->assertFalse($handler->handle($this->getRecord(Logger::WARNING))); - } - - /** - * @covers Monolog\Handler\FilterHandler::handle - */ - public function testHandleWithCallback() - { - $test = new TestHandler(); - $handler = new FilterHandler( - function ($record, $handler) use ($test) { - return $test; - }, Logger::INFO, Logger::NOTICE, false - ); - $handler->handle($this->getRecord(Logger::DEBUG)); - $handler->handle($this->getRecord(Logger::INFO)); - $this->assertFalse($test->hasDebugRecords()); - $this->assertTrue($test->hasInfoRecords()); - } - - /** - * @covers Monolog\Handler\FilterHandler::handle - * @expectedException \RuntimeException - */ - public function testHandleWithBadCallbackThrowsException() - { - $handler = new FilterHandler( - function ($record, $handler) { - return 'foo'; - } - ); - $handler->handle($this->getRecord(Logger::WARNING)); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/FingersCrossedHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/FingersCrossedHandlerTest.php deleted file mode 100644 index 0ec3653..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/FingersCrossedHandlerTest.php +++ /dev/null @@ -1,279 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; -use Monolog\Logger; -use Monolog\Handler\FingersCrossed\ErrorLevelActivationStrategy; -use Monolog\Handler\FingersCrossed\ChannelLevelActivationStrategy; -use Psr\Log\LogLevel; - -class FingersCrossedHandlerTest extends TestCase -{ - /** - * @covers Monolog\Handler\FingersCrossedHandler::__construct - * @covers Monolog\Handler\FingersCrossedHandler::handle - * @covers Monolog\Handler\FingersCrossedHandler::activate - */ - public function testHandleBuffers() - { - $test = new TestHandler(); - $handler = new FingersCrossedHandler($test); - $handler->handle($this->getRecord(Logger::DEBUG)); - $handler->handle($this->getRecord(Logger::INFO)); - $this->assertFalse($test->hasDebugRecords()); - $this->assertFalse($test->hasInfoRecords()); - $handler->handle($this->getRecord(Logger::WARNING)); - $handler->close(); - $this->assertTrue($test->hasInfoRecords()); - $this->assertTrue(count($test->getRecords()) === 3); - } - - /** - * @covers Monolog\Handler\FingersCrossedHandler::handle - * @covers Monolog\Handler\FingersCrossedHandler::activate - */ - public function testHandleStopsBufferingAfterTrigger() - { - $test = new TestHandler(); - $handler = new FingersCrossedHandler($test); - $handler->handle($this->getRecord(Logger::WARNING)); - $handler->handle($this->getRecord(Logger::DEBUG)); - $handler->close(); - $this->assertTrue($test->hasWarningRecords()); - $this->assertTrue($test->hasDebugRecords()); - } - - /** - * @covers Monolog\Handler\FingersCrossedHandler::handle - * @covers Monolog\Handler\FingersCrossedHandler::activate - * @covers Monolog\Handler\FingersCrossedHandler::reset - */ - public function testHandleResetBufferingAfterReset() - { - $test = new TestHandler(); - $handler = new FingersCrossedHandler($test); - $handler->handle($this->getRecord(Logger::WARNING)); - $handler->handle($this->getRecord(Logger::DEBUG)); - $handler->reset(); - $handler->handle($this->getRecord(Logger::INFO)); - $handler->close(); - $this->assertTrue($test->hasWarningRecords()); - $this->assertTrue($test->hasDebugRecords()); - $this->assertFalse($test->hasInfoRecords()); - } - - /** - * @covers Monolog\Handler\FingersCrossedHandler::handle - * @covers Monolog\Handler\FingersCrossedHandler::activate - */ - public function testHandleResetBufferingAfterBeingTriggeredWhenStopBufferingIsDisabled() - { - $test = new TestHandler(); - $handler = new FingersCrossedHandler($test, Logger::WARNING, 0, false, false); - $handler->handle($this->getRecord(Logger::DEBUG)); - $handler->handle($this->getRecord(Logger::WARNING)); - $handler->handle($this->getRecord(Logger::INFO)); - $handler->close(); - $this->assertTrue($test->hasWarningRecords()); - $this->assertTrue($test->hasDebugRecords()); - $this->assertFalse($test->hasInfoRecords()); - } - - /** - * @covers Monolog\Handler\FingersCrossedHandler::handle - * @covers Monolog\Handler\FingersCrossedHandler::activate - */ - public function testHandleBufferLimit() - { - $test = new TestHandler(); - $handler = new FingersCrossedHandler($test, Logger::WARNING, 2); - $handler->handle($this->getRecord(Logger::DEBUG)); - $handler->handle($this->getRecord(Logger::DEBUG)); - $handler->handle($this->getRecord(Logger::INFO)); - $handler->handle($this->getRecord(Logger::WARNING)); - $this->assertTrue($test->hasWarningRecords()); - $this->assertTrue($test->hasInfoRecords()); - $this->assertFalse($test->hasDebugRecords()); - } - - /** - * @covers Monolog\Handler\FingersCrossedHandler::handle - * @covers Monolog\Handler\FingersCrossedHandler::activate - */ - public function testHandleWithCallback() - { - $test = new TestHandler(); - $handler = new FingersCrossedHandler(function ($record, $handler) use ($test) { - return $test; - }); - $handler->handle($this->getRecord(Logger::DEBUG)); - $handler->handle($this->getRecord(Logger::INFO)); - $this->assertFalse($test->hasDebugRecords()); - $this->assertFalse($test->hasInfoRecords()); - $handler->handle($this->getRecord(Logger::WARNING)); - $this->assertTrue($test->hasInfoRecords()); - $this->assertTrue(count($test->getRecords()) === 3); - } - - /** - * @covers Monolog\Handler\FingersCrossedHandler::handle - * @covers Monolog\Handler\FingersCrossedHandler::activate - * @expectedException RuntimeException - */ - public function testHandleWithBadCallbackThrowsException() - { - $handler = new FingersCrossedHandler(function ($record, $handler) { - return 'foo'; - }); - $handler->handle($this->getRecord(Logger::WARNING)); - } - - /** - * @covers Monolog\Handler\FingersCrossedHandler::isHandling - */ - public function testIsHandlingAlways() - { - $test = new TestHandler(); - $handler = new FingersCrossedHandler($test, Logger::ERROR); - $this->assertTrue($handler->isHandling($this->getRecord(Logger::DEBUG))); - } - - /** - * @covers Monolog\Handler\FingersCrossedHandler::__construct - * @covers Monolog\Handler\FingersCrossed\ErrorLevelActivationStrategy::__construct - * @covers Monolog\Handler\FingersCrossed\ErrorLevelActivationStrategy::isHandlerActivated - */ - public function testErrorLevelActivationStrategy() - { - $test = new TestHandler(); - $handler = new FingersCrossedHandler($test, new ErrorLevelActivationStrategy(Logger::WARNING)); - $handler->handle($this->getRecord(Logger::DEBUG)); - $this->assertFalse($test->hasDebugRecords()); - $handler->handle($this->getRecord(Logger::WARNING)); - $this->assertTrue($test->hasDebugRecords()); - $this->assertTrue($test->hasWarningRecords()); - } - - /** - * @covers Monolog\Handler\FingersCrossedHandler::__construct - * @covers Monolog\Handler\FingersCrossed\ErrorLevelActivationStrategy::__construct - * @covers Monolog\Handler\FingersCrossed\ErrorLevelActivationStrategy::isHandlerActivated - */ - public function testErrorLevelActivationStrategyWithPsrLevel() - { - $test = new TestHandler(); - $handler = new FingersCrossedHandler($test, new ErrorLevelActivationStrategy('warning')); - $handler->handle($this->getRecord(Logger::DEBUG)); - $this->assertFalse($test->hasDebugRecords()); - $handler->handle($this->getRecord(Logger::WARNING)); - $this->assertTrue($test->hasDebugRecords()); - $this->assertTrue($test->hasWarningRecords()); - } - - /** - * @covers Monolog\Handler\FingersCrossedHandler::__construct - * @covers Monolog\Handler\FingersCrossedHandler::activate - */ - public function testOverrideActivationStrategy() - { - $test = new TestHandler(); - $handler = new FingersCrossedHandler($test, new ErrorLevelActivationStrategy('warning')); - $handler->handle($this->getRecord(Logger::DEBUG)); - $this->assertFalse($test->hasDebugRecords()); - $handler->activate(); - $this->assertTrue($test->hasDebugRecords()); - $handler->handle($this->getRecord(Logger::INFO)); - $this->assertTrue($test->hasInfoRecords()); - } - - /** - * @covers Monolog\Handler\FingersCrossed\ChannelLevelActivationStrategy::__construct - * @covers Monolog\Handler\FingersCrossed\ChannelLevelActivationStrategy::isHandlerActivated - */ - public function testChannelLevelActivationStrategy() - { - $test = new TestHandler(); - $handler = new FingersCrossedHandler($test, new ChannelLevelActivationStrategy(Logger::ERROR, array('othertest' => Logger::DEBUG))); - $handler->handle($this->getRecord(Logger::WARNING)); - $this->assertFalse($test->hasWarningRecords()); - $record = $this->getRecord(Logger::DEBUG); - $record['channel'] = 'othertest'; - $handler->handle($record); - $this->assertTrue($test->hasDebugRecords()); - $this->assertTrue($test->hasWarningRecords()); - } - - /** - * @covers Monolog\Handler\FingersCrossed\ChannelLevelActivationStrategy::__construct - * @covers Monolog\Handler\FingersCrossed\ChannelLevelActivationStrategy::isHandlerActivated - */ - public function testChannelLevelActivationStrategyWithPsrLevels() - { - $test = new TestHandler(); - $handler = new FingersCrossedHandler($test, new ChannelLevelActivationStrategy('error', array('othertest' => 'debug'))); - $handler->handle($this->getRecord(Logger::WARNING)); - $this->assertFalse($test->hasWarningRecords()); - $record = $this->getRecord(Logger::DEBUG); - $record['channel'] = 'othertest'; - $handler->handle($record); - $this->assertTrue($test->hasDebugRecords()); - $this->assertTrue($test->hasWarningRecords()); - } - - /** - * @covers Monolog\Handler\FingersCrossedHandler::handle - * @covers Monolog\Handler\FingersCrossedHandler::activate - */ - public function testHandleUsesProcessors() - { - $test = new TestHandler(); - $handler = new FingersCrossedHandler($test, Logger::INFO); - $handler->pushProcessor(function ($record) { - $record['extra']['foo'] = true; - - return $record; - }); - $handler->handle($this->getRecord(Logger::WARNING)); - $this->assertTrue($test->hasWarningRecords()); - $records = $test->getRecords(); - $this->assertTrue($records[0]['extra']['foo']); - } - - /** - * @covers Monolog\Handler\FingersCrossedHandler::close - */ - public function testPassthruOnClose() - { - $test = new TestHandler(); - $handler = new FingersCrossedHandler($test, new ErrorLevelActivationStrategy(Logger::WARNING), 0, true, true, Logger::INFO); - $handler->handle($this->getRecord(Logger::DEBUG)); - $handler->handle($this->getRecord(Logger::INFO)); - $handler->close(); - $this->assertFalse($test->hasDebugRecords()); - $this->assertTrue($test->hasInfoRecords()); - } - - /** - * @covers Monolog\Handler\FingersCrossedHandler::close - */ - public function testPsrLevelPassthruOnClose() - { - $test = new TestHandler(); - $handler = new FingersCrossedHandler($test, new ErrorLevelActivationStrategy(Logger::WARNING), 0, true, true, LogLevel::INFO); - $handler->handle($this->getRecord(Logger::DEBUG)); - $handler->handle($this->getRecord(Logger::INFO)); - $handler->close(); - $this->assertFalse($test->hasDebugRecords()); - $this->assertTrue($test->hasInfoRecords()); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/FirePHPHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/FirePHPHandlerTest.php deleted file mode 100644 index 7a404e6..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/FirePHPHandlerTest.php +++ /dev/null @@ -1,96 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; -use Monolog\Logger; - -/** - * @covers Monolog\Handler\FirePHPHandler - */ -class FirePHPHandlerTest extends TestCase -{ - public function setUp() - { - TestFirePHPHandler::resetStatic(); - $_SERVER['HTTP_USER_AGENT'] = 'Monolog Test; FirePHP/1.0'; - } - - public function testHeaders() - { - $handler = new TestFirePHPHandler; - $handler->setFormatter($this->getIdentityFormatter()); - $handler->handle($this->getRecord(Logger::DEBUG)); - $handler->handle($this->getRecord(Logger::WARNING)); - - $expected = array( - 'X-Wf-Protocol-1' => 'http://meta.wildfirehq.org/Protocol/JsonStream/0.2', - 'X-Wf-1-Structure-1' => 'http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1', - 'X-Wf-1-Plugin-1' => 'http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/0.3', - 'X-Wf-1-1-1-1' => 'test', - 'X-Wf-1-1-1-2' => 'test', - ); - - $this->assertEquals($expected, $handler->getHeaders()); - } - - public function testConcurrentHandlers() - { - $handler = new TestFirePHPHandler; - $handler->setFormatter($this->getIdentityFormatter()); - $handler->handle($this->getRecord(Logger::DEBUG)); - $handler->handle($this->getRecord(Logger::WARNING)); - - $handler2 = new TestFirePHPHandler; - $handler2->setFormatter($this->getIdentityFormatter()); - $handler2->handle($this->getRecord(Logger::DEBUG)); - $handler2->handle($this->getRecord(Logger::WARNING)); - - $expected = array( - 'X-Wf-Protocol-1' => 'http://meta.wildfirehq.org/Protocol/JsonStream/0.2', - 'X-Wf-1-Structure-1' => 'http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1', - 'X-Wf-1-Plugin-1' => 'http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/0.3', - 'X-Wf-1-1-1-1' => 'test', - 'X-Wf-1-1-1-2' => 'test', - ); - - $expected2 = array( - 'X-Wf-1-1-1-3' => 'test', - 'X-Wf-1-1-1-4' => 'test', - ); - - $this->assertEquals($expected, $handler->getHeaders()); - $this->assertEquals($expected2, $handler2->getHeaders()); - } -} - -class TestFirePHPHandler extends FirePHPHandler -{ - protected $headers = array(); - - public static function resetStatic() - { - self::$initialized = false; - self::$sendHeaders = true; - self::$messageIndex = 1; - } - - protected function sendHeader($header, $content) - { - $this->headers[$header] = $content; - } - - public function getHeaders() - { - return $this->headers; - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/Fixtures/.gitkeep b/vendor/monolog/monolog/tests/Monolog/Handler/Fixtures/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/FleepHookHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/FleepHookHandlerTest.php deleted file mode 100644 index 91cdd31..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/FleepHookHandlerTest.php +++ /dev/null @@ -1,85 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\Formatter\LineFormatter; -use Monolog\Logger; -use Monolog\TestCase; - -/** - * @coversDefaultClass \Monolog\Handler\FleepHookHandler - */ -class FleepHookHandlerTest extends TestCase -{ - /** - * Default token to use in tests - */ - const TOKEN = '123abc'; - - /** - * @var FleepHookHandler - */ - private $handler; - - public function setUp() - { - parent::setUp(); - - if (!extension_loaded('openssl')) { - $this->markTestSkipped('This test requires openssl extension to run'); - } - - // Create instances of the handler and logger for convenience - $this->handler = new FleepHookHandler(self::TOKEN); - } - - /** - * @covers ::__construct - */ - public function testConstructorSetsExpectedDefaults() - { - $this->assertEquals(Logger::DEBUG, $this->handler->getLevel()); - $this->assertEquals(true, $this->handler->getBubble()); - } - - /** - * @covers ::getDefaultFormatter - */ - public function testHandlerUsesLineFormatterWhichIgnoresEmptyArrays() - { - $record = array( - 'message' => 'msg', - 'context' => array(), - 'level' => Logger::DEBUG, - 'level_name' => Logger::getLevelName(Logger::DEBUG), - 'channel' => 'channel', - 'datetime' => new \DateTime(), - 'extra' => array(), - ); - - $expectedFormatter = new LineFormatter(null, null, true, true); - $expected = $expectedFormatter->format($record); - - $handlerFormatter = $this->handler->getFormatter(); - $actual = $handlerFormatter->format($record); - - $this->assertEquals($expected, $actual, 'Empty context and extra arrays should not be rendered'); - } - - /** - * @covers ::__construct - */ - public function testConnectionStringisConstructedCorrectly() - { - $this->assertEquals('ssl://' . FleepHookHandler::FLEEP_HOST . ':443', $this->handler->getConnectionString()); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/FlowdockHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/FlowdockHandlerTest.php deleted file mode 100644 index 4b120d5..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/FlowdockHandlerTest.php +++ /dev/null @@ -1,88 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\Formatter\FlowdockFormatter; -use Monolog\TestCase; -use Monolog\Logger; - -/** - * @author Dominik Liebler - * @see https://www.hipchat.com/docs/api - */ -class FlowdockHandlerTest extends TestCase -{ - /** - * @var resource - */ - private $res; - - /** - * @var FlowdockHandler - */ - private $handler; - - public function setUp() - { - if (!extension_loaded('openssl')) { - $this->markTestSkipped('This test requires openssl to run'); - } - } - - public function testWriteHeader() - { - $this->createHandler(); - $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1')); - fseek($this->res, 0); - $content = fread($this->res, 1024); - - $this->assertRegexp('/POST \/v1\/messages\/team_inbox\/.* HTTP\/1.1\\r\\nHost: api.flowdock.com\\r\\nContent-Type: application\/json\\r\\nContent-Length: \d{2,4}\\r\\n\\r\\n/', $content); - - return $content; - } - - /** - * @depends testWriteHeader - */ - public function testWriteContent($content) - { - $this->assertRegexp('/"source":"test_source"/', $content); - $this->assertRegexp('/"from_address":"source@test\.com"/', $content); - } - - private function createHandler($token = 'myToken') - { - $constructorArgs = array($token, Logger::DEBUG); - $this->res = fopen('php://memory', 'a'); - $this->handler = $this->getMock( - '\Monolog\Handler\FlowdockHandler', - array('fsockopen', 'streamSetTimeout', 'closeSocket'), - $constructorArgs - ); - - $reflectionProperty = new \ReflectionProperty('\Monolog\Handler\SocketHandler', 'connectionString'); - $reflectionProperty->setAccessible(true); - $reflectionProperty->setValue($this->handler, 'localhost:1234'); - - $this->handler->expects($this->any()) - ->method('fsockopen') - ->will($this->returnValue($this->res)); - $this->handler->expects($this->any()) - ->method('streamSetTimeout') - ->will($this->returnValue(true)); - $this->handler->expects($this->any()) - ->method('closeSocket') - ->will($this->returnValue(true)); - - $this->handler->setFormatter(new FlowdockFormatter('test_source', 'source@test.com')); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/GelfHandlerLegacyTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/GelfHandlerLegacyTest.php deleted file mode 100644 index 9d007b1..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/GelfHandlerLegacyTest.php +++ /dev/null @@ -1,95 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Gelf\Message; -use Monolog\TestCase; -use Monolog\Logger; -use Monolog\Formatter\GelfMessageFormatter; - -class GelfHandlerLegacyTest extends TestCase -{ - public function setUp() - { - if (!class_exists('Gelf\MessagePublisher') || !class_exists('Gelf\Message')) { - $this->markTestSkipped("mlehner/gelf-php not installed"); - } - - require_once __DIR__ . '/GelfMockMessagePublisher.php'; - } - - /** - * @covers Monolog\Handler\GelfHandler::__construct - */ - public function testConstruct() - { - $handler = new GelfHandler($this->getMessagePublisher()); - $this->assertInstanceOf('Monolog\Handler\GelfHandler', $handler); - } - - protected function getHandler($messagePublisher) - { - $handler = new GelfHandler($messagePublisher); - - return $handler; - } - - protected function getMessagePublisher() - { - return new GelfMockMessagePublisher('localhost'); - } - - public function testDebug() - { - $messagePublisher = $this->getMessagePublisher(); - $handler = $this->getHandler($messagePublisher); - - $record = $this->getRecord(Logger::DEBUG, "A test debug message"); - $handler->handle($record); - - $this->assertEquals(7, $messagePublisher->lastMessage->getLevel()); - $this->assertEquals('test', $messagePublisher->lastMessage->getFacility()); - $this->assertEquals($record['message'], $messagePublisher->lastMessage->getShortMessage()); - $this->assertEquals(null, $messagePublisher->lastMessage->getFullMessage()); - } - - public function testWarning() - { - $messagePublisher = $this->getMessagePublisher(); - $handler = $this->getHandler($messagePublisher); - - $record = $this->getRecord(Logger::WARNING, "A test warning message"); - $handler->handle($record); - - $this->assertEquals(4, $messagePublisher->lastMessage->getLevel()); - $this->assertEquals('test', $messagePublisher->lastMessage->getFacility()); - $this->assertEquals($record['message'], $messagePublisher->lastMessage->getShortMessage()); - $this->assertEquals(null, $messagePublisher->lastMessage->getFullMessage()); - } - - public function testInjectedGelfMessageFormatter() - { - $messagePublisher = $this->getMessagePublisher(); - $handler = $this->getHandler($messagePublisher); - - $handler->setFormatter(new GelfMessageFormatter('mysystem', 'EXT', 'CTX')); - - $record = $this->getRecord(Logger::WARNING, "A test warning message"); - $record['extra']['blarg'] = 'yep'; - $record['context']['from'] = 'logger'; - $handler->handle($record); - - $this->assertEquals('mysystem', $messagePublisher->lastMessage->getHost()); - $this->assertArrayHasKey('_EXTblarg', $messagePublisher->lastMessage->toArray()); - $this->assertArrayHasKey('_CTXfrom', $messagePublisher->lastMessage->toArray()); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/GelfHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/GelfHandlerTest.php deleted file mode 100644 index 8cdd64f..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/GelfHandlerTest.php +++ /dev/null @@ -1,117 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Gelf\Message; -use Monolog\TestCase; -use Monolog\Logger; -use Monolog\Formatter\GelfMessageFormatter; - -class GelfHandlerTest extends TestCase -{ - public function setUp() - { - if (!class_exists('Gelf\Publisher') || !class_exists('Gelf\Message')) { - $this->markTestSkipped("graylog2/gelf-php not installed"); - } - } - - /** - * @covers Monolog\Handler\GelfHandler::__construct - */ - public function testConstruct() - { - $handler = new GelfHandler($this->getMessagePublisher()); - $this->assertInstanceOf('Monolog\Handler\GelfHandler', $handler); - } - - protected function getHandler($messagePublisher) - { - $handler = new GelfHandler($messagePublisher); - - return $handler; - } - - protected function getMessagePublisher() - { - return $this->getMock('Gelf\Publisher', array('publish'), array(), '', false); - } - - public function testDebug() - { - $record = $this->getRecord(Logger::DEBUG, "A test debug message"); - $expectedMessage = new Message(); - $expectedMessage - ->setLevel(7) - ->setFacility("test") - ->setShortMessage($record['message']) - ->setTimestamp($record['datetime']) - ; - - $messagePublisher = $this->getMessagePublisher(); - $messagePublisher->expects($this->once()) - ->method('publish') - ->with($expectedMessage); - - $handler = $this->getHandler($messagePublisher); - - $handler->handle($record); - } - - public function testWarning() - { - $record = $this->getRecord(Logger::WARNING, "A test warning message"); - $expectedMessage = new Message(); - $expectedMessage - ->setLevel(4) - ->setFacility("test") - ->setShortMessage($record['message']) - ->setTimestamp($record['datetime']) - ; - - $messagePublisher = $this->getMessagePublisher(); - $messagePublisher->expects($this->once()) - ->method('publish') - ->with($expectedMessage); - - $handler = $this->getHandler($messagePublisher); - - $handler->handle($record); - } - - public function testInjectedGelfMessageFormatter() - { - $record = $this->getRecord(Logger::WARNING, "A test warning message"); - $record['extra']['blarg'] = 'yep'; - $record['context']['from'] = 'logger'; - - $expectedMessage = new Message(); - $expectedMessage - ->setLevel(4) - ->setFacility("test") - ->setHost("mysystem") - ->setShortMessage($record['message']) - ->setTimestamp($record['datetime']) - ->setAdditional("EXTblarg", 'yep') - ->setAdditional("CTXfrom", 'logger') - ; - - $messagePublisher = $this->getMessagePublisher(); - $messagePublisher->expects($this->once()) - ->method('publish') - ->with($expectedMessage); - - $handler = $this->getHandler($messagePublisher); - $handler->setFormatter(new GelfMessageFormatter('mysystem', 'EXT', 'CTX')); - $handler->handle($record); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/GroupHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/GroupHandlerTest.php deleted file mode 100644 index a1b8617..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/GroupHandlerTest.php +++ /dev/null @@ -1,112 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; -use Monolog\Logger; - -class GroupHandlerTest extends TestCase -{ - /** - * @covers Monolog\Handler\GroupHandler::__construct - * @expectedException InvalidArgumentException - */ - public function testConstructorOnlyTakesHandler() - { - new GroupHandler(array(new TestHandler(), "foo")); - } - - /** - * @covers Monolog\Handler\GroupHandler::__construct - * @covers Monolog\Handler\GroupHandler::handle - */ - public function testHandle() - { - $testHandlers = array(new TestHandler(), new TestHandler()); - $handler = new GroupHandler($testHandlers); - $handler->handle($this->getRecord(Logger::DEBUG)); - $handler->handle($this->getRecord(Logger::INFO)); - foreach ($testHandlers as $test) { - $this->assertTrue($test->hasDebugRecords()); - $this->assertTrue($test->hasInfoRecords()); - $this->assertTrue(count($test->getRecords()) === 2); - } - } - - /** - * @covers Monolog\Handler\GroupHandler::handleBatch - */ - public function testHandleBatch() - { - $testHandlers = array(new TestHandler(), new TestHandler()); - $handler = new GroupHandler($testHandlers); - $handler->handleBatch(array($this->getRecord(Logger::DEBUG), $this->getRecord(Logger::INFO))); - foreach ($testHandlers as $test) { - $this->assertTrue($test->hasDebugRecords()); - $this->assertTrue($test->hasInfoRecords()); - $this->assertTrue(count($test->getRecords()) === 2); - } - } - - /** - * @covers Monolog\Handler\GroupHandler::isHandling - */ - public function testIsHandling() - { - $testHandlers = array(new TestHandler(Logger::ERROR), new TestHandler(Logger::WARNING)); - $handler = new GroupHandler($testHandlers); - $this->assertTrue($handler->isHandling($this->getRecord(Logger::ERROR))); - $this->assertTrue($handler->isHandling($this->getRecord(Logger::WARNING))); - $this->assertFalse($handler->isHandling($this->getRecord(Logger::DEBUG))); - } - - /** - * @covers Monolog\Handler\GroupHandler::handle - */ - public function testHandleUsesProcessors() - { - $test = new TestHandler(); - $handler = new GroupHandler(array($test)); - $handler->pushProcessor(function ($record) { - $record['extra']['foo'] = true; - - return $record; - }); - $handler->handle($this->getRecord(Logger::WARNING)); - $this->assertTrue($test->hasWarningRecords()); - $records = $test->getRecords(); - $this->assertTrue($records[0]['extra']['foo']); - } - - /** - * @covers Monolog\Handler\GroupHandler::handle - */ - public function testHandleBatchUsesProcessors() - { - $testHandlers = array(new TestHandler(), new TestHandler()); - $handler = new GroupHandler($testHandlers); - $handler->pushProcessor(function ($record) { - $record['extra']['foo'] = true; - - return $record; - }); - $handler->handleBatch(array($this->getRecord(Logger::DEBUG), $this->getRecord(Logger::INFO))); - foreach ($testHandlers as $test) { - $this->assertTrue($test->hasDebugRecords()); - $this->assertTrue($test->hasInfoRecords()); - $this->assertTrue(count($test->getRecords()) === 2); - $records = $test->getRecords(); - $this->assertTrue($records[0]['extra']['foo']); - $this->assertTrue($records[1]['extra']['foo']); - } - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/HandlerWrapperTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/HandlerWrapperTest.php deleted file mode 100644 index d8d0452..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/HandlerWrapperTest.php +++ /dev/null @@ -1,130 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; - -/** - * @author Alexey Karapetov - */ -class HandlerWrapperTest extends TestCase -{ - /** - * @var HandlerWrapper - */ - private $wrapper; - - private $handler; - - public function setUp() - { - parent::setUp(); - $this->handler = $this->getMock('Monolog\\Handler\\HandlerInterface'); - $this->wrapper = new HandlerWrapper($this->handler); - } - - /** - * @return array - */ - public function trueFalseDataProvider() - { - return array( - array(true), - array(false), - ); - } - - /** - * @param $result - * @dataProvider trueFalseDataProvider - */ - public function testIsHandling($result) - { - $record = $this->getRecord(); - $this->handler->expects($this->once()) - ->method('isHandling') - ->with($record) - ->willReturn($result); - - $this->assertEquals($result, $this->wrapper->isHandling($record)); - } - - /** - * @param $result - * @dataProvider trueFalseDataProvider - */ - public function testHandle($result) - { - $record = $this->getRecord(); - $this->handler->expects($this->once()) - ->method('handle') - ->with($record) - ->willReturn($result); - - $this->assertEquals($result, $this->wrapper->handle($record)); - } - - /** - * @param $result - * @dataProvider trueFalseDataProvider - */ - public function testHandleBatch($result) - { - $records = $this->getMultipleRecords(); - $this->handler->expects($this->once()) - ->method('handleBatch') - ->with($records) - ->willReturn($result); - - $this->assertEquals($result, $this->wrapper->handleBatch($records)); - } - - public function testPushProcessor() - { - $processor = function () {}; - $this->handler->expects($this->once()) - ->method('pushProcessor') - ->with($processor); - - $this->assertEquals($this->wrapper, $this->wrapper->pushProcessor($processor)); - } - - public function testPopProcessor() - { - $processor = function () {}; - $this->handler->expects($this->once()) - ->method('popProcessor') - ->willReturn($processor); - - $this->assertEquals($processor, $this->wrapper->popProcessor()); - } - - public function testSetFormatter() - { - $formatter = $this->getMock('Monolog\\Formatter\\FormatterInterface'); - $this->handler->expects($this->once()) - ->method('setFormatter') - ->with($formatter); - - $this->assertEquals($this->wrapper, $this->wrapper->setFormatter($formatter)); - } - - public function testGetFormatter() - { - $formatter = $this->getMock('Monolog\\Formatter\\FormatterInterface'); - $this->handler->expects($this->once()) - ->method('getFormatter') - ->willReturn($formatter); - - $this->assertEquals($formatter, $this->wrapper->getFormatter()); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/HipChatHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/HipChatHandlerTest.php deleted file mode 100644 index 52dc9da..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/HipChatHandlerTest.php +++ /dev/null @@ -1,279 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; -use Monolog\Logger; - -/** - * @author Rafael Dohms - * @see https://www.hipchat.com/docs/api - */ -class HipChatHandlerTest extends TestCase -{ - private $res; - /** @var HipChatHandler */ - private $handler; - - public function testWriteHeader() - { - $this->createHandler(); - $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1')); - fseek($this->res, 0); - $content = fread($this->res, 1024); - - $this->assertRegexp('/POST \/v1\/rooms\/message\?format=json&auth_token=.* HTTP\/1.1\\r\\nHost: api.hipchat.com\\r\\nContent-Type: application\/x-www-form-urlencoded\\r\\nContent-Length: \d{2,4}\\r\\n\\r\\n/', $content); - - return $content; - } - - public function testWriteCustomHostHeader() - { - $this->createHandler('myToken', 'room1', 'Monolog', true, 'hipchat.foo.bar'); - $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1')); - fseek($this->res, 0); - $content = fread($this->res, 1024); - - $this->assertRegexp('/POST \/v1\/rooms\/message\?format=json&auth_token=.* HTTP\/1.1\\r\\nHost: hipchat.foo.bar\\r\\nContent-Type: application\/x-www-form-urlencoded\\r\\nContent-Length: \d{2,4}\\r\\n\\r\\n/', $content); - - return $content; - } - - public function testWriteV2() - { - $this->createHandler('myToken', 'room1', 'Monolog', false, 'hipchat.foo.bar', 'v2'); - $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1')); - fseek($this->res, 0); - $content = fread($this->res, 1024); - - $this->assertRegexp('/POST \/v2\/room\/room1\/notification\?auth_token=.* HTTP\/1.1\\r\\nHost: hipchat.foo.bar\\r\\nContent-Type: application\/x-www-form-urlencoded\\r\\nContent-Length: \d{2,4}\\r\\n\\r\\n/', $content); - - return $content; - } - - public function testWriteV2Notify() - { - $this->createHandler('myToken', 'room1', 'Monolog', true, 'hipchat.foo.bar', 'v2'); - $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1')); - fseek($this->res, 0); - $content = fread($this->res, 1024); - - $this->assertRegexp('/POST \/v2\/room\/room1\/notification\?auth_token=.* HTTP\/1.1\\r\\nHost: hipchat.foo.bar\\r\\nContent-Type: application\/x-www-form-urlencoded\\r\\nContent-Length: \d{2,4}\\r\\n\\r\\n/', $content); - - return $content; - } - - public function testRoomSpaces() - { - $this->createHandler('myToken', 'room name', 'Monolog', false, 'hipchat.foo.bar', 'v2'); - $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1')); - fseek($this->res, 0); - $content = fread($this->res, 1024); - - $this->assertRegexp('/POST \/v2\/room\/room%20name\/notification\?auth_token=.* HTTP\/1.1\\r\\nHost: hipchat.foo.bar\\r\\nContent-Type: application\/x-www-form-urlencoded\\r\\nContent-Length: \d{2,4}\\r\\n\\r\\n/', $content); - - return $content; - } - - /** - * @depends testWriteHeader - */ - public function testWriteContent($content) - { - $this->assertRegexp('/notify=0&message=test1&message_format=text&color=red&room_id=room1&from=Monolog$/', $content); - } - - public function testWriteContentV1WithoutName() - { - $this->createHandler('myToken', 'room1', null, false, 'hipchat.foo.bar', 'v1'); - $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1')); - fseek($this->res, 0); - $content = fread($this->res, 1024); - - $this->assertRegexp('/notify=0&message=test1&message_format=text&color=red&room_id=room1&from=$/', $content); - - return $content; - } - - /** - * @depends testWriteCustomHostHeader - */ - public function testWriteContentNotify($content) - { - $this->assertRegexp('/notify=1&message=test1&message_format=text&color=red&room_id=room1&from=Monolog$/', $content); - } - - /** - * @depends testWriteV2 - */ - public function testWriteContentV2($content) - { - $this->assertRegexp('/notify=false&message=test1&message_format=text&color=red&from=Monolog$/', $content); - } - - /** - * @depends testWriteV2Notify - */ - public function testWriteContentV2Notify($content) - { - $this->assertRegexp('/notify=true&message=test1&message_format=text&color=red&from=Monolog$/', $content); - } - - public function testWriteContentV2WithoutName() - { - $this->createHandler('myToken', 'room1', null, false, 'hipchat.foo.bar', 'v2'); - $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1')); - fseek($this->res, 0); - $content = fread($this->res, 1024); - - $this->assertRegexp('/notify=false&message=test1&message_format=text&color=red$/', $content); - - return $content; - } - - public function testWriteWithComplexMessage() - { - $this->createHandler(); - $this->handler->handle($this->getRecord(Logger::CRITICAL, 'Backup of database "example" finished in 16 minutes.')); - fseek($this->res, 0); - $content = fread($this->res, 1024); - - $this->assertRegexp('/message=Backup\+of\+database\+%22example%22\+finished\+in\+16\+minutes\./', $content); - } - - public function testWriteTruncatesLongMessage() - { - $this->createHandler(); - $this->handler->handle($this->getRecord(Logger::CRITICAL, str_repeat('abcde', 2000))); - fseek($this->res, 0); - $content = fread($this->res, 12000); - - $this->assertRegexp('/message='.str_repeat('abcde', 1900).'\+%5Btruncated%5D/', $content); - } - - /** - * @dataProvider provideLevelColors - */ - public function testWriteWithErrorLevelsAndColors($level, $expectedColor) - { - $this->createHandler(); - $this->handler->handle($this->getRecord($level, 'Backup of database "example" finished in 16 minutes.')); - fseek($this->res, 0); - $content = fread($this->res, 1024); - - $this->assertRegexp('/color='.$expectedColor.'/', $content); - } - - public function provideLevelColors() - { - return array( - array(Logger::DEBUG, 'gray'), - array(Logger::INFO, 'green'), - array(Logger::WARNING, 'yellow'), - array(Logger::ERROR, 'red'), - array(Logger::CRITICAL, 'red'), - array(Logger::ALERT, 'red'), - array(Logger::EMERGENCY,'red'), - array(Logger::NOTICE, 'green'), - ); - } - - /** - * @dataProvider provideBatchRecords - */ - public function testHandleBatch($records, $expectedColor) - { - $this->createHandler(); - - $this->handler->handleBatch($records); - - fseek($this->res, 0); - $content = fread($this->res, 1024); - - $this->assertRegexp('/color='.$expectedColor.'/', $content); - } - - public function provideBatchRecords() - { - return array( - array( - array( - array('level' => Logger::WARNING, 'message' => 'Oh bugger!', 'level_name' => 'warning', 'datetime' => new \DateTime()), - array('level' => Logger::NOTICE, 'message' => 'Something noticeable happened.', 'level_name' => 'notice', 'datetime' => new \DateTime()), - array('level' => Logger::CRITICAL, 'message' => 'Everything is broken!', 'level_name' => 'critical', 'datetime' => new \DateTime()), - ), - 'red', - ), - array( - array( - array('level' => Logger::WARNING, 'message' => 'Oh bugger!', 'level_name' => 'warning', 'datetime' => new \DateTime()), - array('level' => Logger::NOTICE, 'message' => 'Something noticeable happened.', 'level_name' => 'notice', 'datetime' => new \DateTime()), - ), - 'yellow', - ), - array( - array( - array('level' => Logger::DEBUG, 'message' => 'Just debugging.', 'level_name' => 'debug', 'datetime' => new \DateTime()), - array('level' => Logger::NOTICE, 'message' => 'Something noticeable happened.', 'level_name' => 'notice', 'datetime' => new \DateTime()), - ), - 'green', - ), - array( - array( - array('level' => Logger::DEBUG, 'message' => 'Just debugging.', 'level_name' => 'debug', 'datetime' => new \DateTime()), - ), - 'gray', - ), - ); - } - - private function createHandler($token = 'myToken', $room = 'room1', $name = 'Monolog', $notify = false, $host = 'api.hipchat.com', $version = 'v1') - { - $constructorArgs = array($token, $room, $name, $notify, Logger::DEBUG, true, true, 'text', $host, $version); - $this->res = fopen('php://memory', 'a'); - $this->handler = $this->getMock( - '\Monolog\Handler\HipChatHandler', - array('fsockopen', 'streamSetTimeout', 'closeSocket'), - $constructorArgs - ); - - $reflectionProperty = new \ReflectionProperty('\Monolog\Handler\SocketHandler', 'connectionString'); - $reflectionProperty->setAccessible(true); - $reflectionProperty->setValue($this->handler, 'localhost:1234'); - - $this->handler->expects($this->any()) - ->method('fsockopen') - ->will($this->returnValue($this->res)); - $this->handler->expects($this->any()) - ->method('streamSetTimeout') - ->will($this->returnValue(true)); - $this->handler->expects($this->any()) - ->method('closeSocket') - ->will($this->returnValue(true)); - - $this->handler->setFormatter($this->getIdentityFormatter()); - } - - /** - * @expectedException InvalidArgumentException - */ - public function testCreateWithTooLongName() - { - $hipChatHandler = new HipChatHandler('token', 'room', 'SixteenCharsHere'); - } - - public function testCreateWithTooLongNameV2() - { - // creating a handler with too long of a name but using the v2 api doesn't matter. - $hipChatHandler = new HipChatHandler('token', 'room', 'SixteenCharsHere', false, Logger::CRITICAL, true, true, 'test', 'api.hipchat.com', 'v2'); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/InsightOpsHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/InsightOpsHandlerTest.php deleted file mode 100644 index 97c18b5..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/InsightOpsHandlerTest.php +++ /dev/null @@ -1,80 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - - namespace Monolog\Handler; - - use Monolog\TestCase; - use Monolog\Logger; - -/** - * @author Robert Kaufmann III - * @author Gabriel Machado - */ -class InsightOpsHandlerTest extends TestCase -{ - /** - * @var resource - */ - private $resource; - - /** - * @var LogEntriesHandler - */ - private $handler; - - public function testWriteContent() - { - $this->createHandler(); - $this->handler->handle($this->getRecord(Logger::CRITICAL, 'Critical write test')); - - fseek($this->resource, 0); - $content = fread($this->resource, 1024); - - $this->assertRegexp('/testToken \[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\] test.CRITICAL: Critical write test/', $content); - } - - public function testWriteBatchContent() - { - $this->createHandler(); - $this->handler->handleBatch($this->getMultipleRecords()); - - fseek($this->resource, 0); - $content = fread($this->resource, 1024); - - $this->assertRegexp('/(testToken \[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\] .* \[\] \[\]\n){3}/', $content); - } - - private function createHandler() - { - $useSSL = extension_loaded('openssl'); - $args = array('testToken', 'us', $useSSL, Logger::DEBUG, true); - $this->resource = fopen('php://memory', 'a'); - $this->handler = $this->getMock( - '\Monolog\Handler\InsightOpsHandler', - array('fsockopen', 'streamSetTimeout', 'closeSocket'), - $args - ); - - $reflectionProperty = new \ReflectionProperty('\Monolog\Handler\SocketHandler', 'connectionString'); - $reflectionProperty->setAccessible(true); - $reflectionProperty->setValue($this->handler, 'localhost:1234'); - - $this->handler->expects($this->any()) - ->method('fsockopen') - ->will($this->returnValue($this->resource)); - $this->handler->expects($this->any()) - ->method('streamSetTimeout') - ->will($this->returnValue(true)); - $this->handler->expects($this->any()) - ->method('closeSocket') - ->will($this->returnValue(true)); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/LogEntriesHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/LogEntriesHandlerTest.php deleted file mode 100644 index b2deb40..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/LogEntriesHandlerTest.php +++ /dev/null @@ -1,84 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; -use Monolog\Logger; - -/** - * @author Robert Kaufmann III - */ -class LogEntriesHandlerTest extends TestCase -{ - /** - * @var resource - */ - private $res; - - /** - * @var LogEntriesHandler - */ - private $handler; - - public function testWriteContent() - { - $this->createHandler(); - $this->handler->handle($this->getRecord(Logger::CRITICAL, 'Critical write test')); - - fseek($this->res, 0); - $content = fread($this->res, 1024); - - $this->assertRegexp('/testToken \[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\] test.CRITICAL: Critical write test/', $content); - } - - public function testWriteBatchContent() - { - $records = array( - $this->getRecord(), - $this->getRecord(), - $this->getRecord(), - ); - $this->createHandler(); - $this->handler->handleBatch($records); - - fseek($this->res, 0); - $content = fread($this->res, 1024); - - $this->assertRegexp('/(testToken \[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\] .* \[\] \[\]\n){3}/', $content); - } - - private function createHandler() - { - $useSSL = extension_loaded('openssl'); - $args = array('testToken', $useSSL, Logger::DEBUG, true); - $this->res = fopen('php://memory', 'a'); - $this->handler = $this->getMock( - '\Monolog\Handler\LogEntriesHandler', - array('fsockopen', 'streamSetTimeout', 'closeSocket'), - $args - ); - - $reflectionProperty = new \ReflectionProperty('\Monolog\Handler\SocketHandler', 'connectionString'); - $reflectionProperty->setAccessible(true); - $reflectionProperty->setValue($this->handler, 'localhost:1234'); - - $this->handler->expects($this->any()) - ->method('fsockopen') - ->will($this->returnValue($this->res)); - $this->handler->expects($this->any()) - ->method('streamSetTimeout') - ->will($this->returnValue(true)); - $this->handler->expects($this->any()) - ->method('closeSocket') - ->will($this->returnValue(true)); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/MailHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/MailHandlerTest.php deleted file mode 100644 index 6754f3d..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/MailHandlerTest.php +++ /dev/null @@ -1,75 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\Logger; -use Monolog\TestCase; - -class MailHandlerTest extends TestCase -{ - /** - * @covers Monolog\Handler\MailHandler::handleBatch - */ - public function testHandleBatch() - { - $formatter = $this->getMock('Monolog\\Formatter\\FormatterInterface'); - $formatter->expects($this->once()) - ->method('formatBatch'); // Each record is formatted - - $handler = $this->getMockForAbstractClass('Monolog\\Handler\\MailHandler'); - $handler->expects($this->once()) - ->method('send'); - $handler->expects($this->never()) - ->method('write'); // write is for individual records - - $handler->setFormatter($formatter); - - $handler->handleBatch($this->getMultipleRecords()); - } - - /** - * @covers Monolog\Handler\MailHandler::handleBatch - */ - public function testHandleBatchNotSendsMailIfMessagesAreBelowLevel() - { - $records = array( - $this->getRecord(Logger::DEBUG, 'debug message 1'), - $this->getRecord(Logger::DEBUG, 'debug message 2'), - $this->getRecord(Logger::INFO, 'information'), - ); - - $handler = $this->getMockForAbstractClass('Monolog\\Handler\\MailHandler'); - $handler->expects($this->never()) - ->method('send'); - $handler->setLevel(Logger::ERROR); - - $handler->handleBatch($records); - } - - /** - * @covers Monolog\Handler\MailHandler::write - */ - public function testHandle() - { - $handler = $this->getMockForAbstractClass('Monolog\\Handler\\MailHandler'); - - $record = $this->getRecord(); - $records = array($record); - $records[0]['formatted'] = '['.$record['datetime']->format('Y-m-d H:i:s').'] test.WARNING: test [] []'."\n"; - - $handler->expects($this->once()) - ->method('send') - ->with($records[0]['formatted'], $records); - - $handler->handle($record); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/MockRavenClient.php b/vendor/monolog/monolog/tests/Monolog/Handler/MockRavenClient.php deleted file mode 100644 index a083322..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/MockRavenClient.php +++ /dev/null @@ -1,27 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Raven_Client; - -class MockRavenClient extends Raven_Client -{ - public function capture($data, $stack, $vars = null) - { - $data = array_merge($this->get_user_data(), $data); - $this->lastData = $data; - $this->lastStack = $stack; - } - - public $lastData; - public $lastStack; -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/MongoDBHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/MongoDBHandlerTest.php deleted file mode 100644 index 0fdef63..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/MongoDBHandlerTest.php +++ /dev/null @@ -1,65 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; -use Monolog\Logger; - -class MongoDBHandlerTest extends TestCase -{ - /** - * @expectedException InvalidArgumentException - */ - public function testConstructorShouldThrowExceptionForInvalidMongo() - { - new MongoDBHandler(new \stdClass(), 'DB', 'Collection'); - } - - public function testHandle() - { - $mongo = $this->getMock('Mongo', array('selectCollection'), array(), '', false); - $collection = $this->getMock('stdClass', array('save')); - - $mongo->expects($this->once()) - ->method('selectCollection') - ->with('DB', 'Collection') - ->will($this->returnValue($collection)); - - $record = $this->getRecord(Logger::WARNING, 'test', array('data' => new \stdClass, 'foo' => 34)); - - $expected = array( - 'message' => 'test', - 'context' => array('data' => '[object] (stdClass: {})', 'foo' => 34), - 'level' => Logger::WARNING, - 'level_name' => 'WARNING', - 'channel' => 'test', - 'datetime' => $record['datetime']->format('Y-m-d H:i:s'), - 'extra' => array(), - ); - - $collection->expects($this->once()) - ->method('save') - ->with($expected); - - $handler = new MongoDBHandler($mongo, 'DB', 'Collection'); - $handler->handle($record); - } -} - -if (!class_exists('Mongo')) { - class Mongo - { - public function selectCollection() - { - } - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/NativeMailerHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/NativeMailerHandlerTest.php deleted file mode 100644 index ddf545d..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/NativeMailerHandlerTest.php +++ /dev/null @@ -1,111 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; -use Monolog\Logger; -use InvalidArgumentException; - -function mail($to, $subject, $message, $additional_headers = null, $additional_parameters = null) -{ - $GLOBALS['mail'][] = func_get_args(); -} - -class NativeMailerHandlerTest extends TestCase -{ - protected function setUp() - { - $GLOBALS['mail'] = array(); - } - - /** - * @expectedException InvalidArgumentException - */ - public function testConstructorHeaderInjection() - { - $mailer = new NativeMailerHandler('spammer@example.org', 'dear victim', "receiver@example.org\r\nFrom: faked@attacker.org"); - } - - /** - * @expectedException InvalidArgumentException - */ - public function testSetterHeaderInjection() - { - $mailer = new NativeMailerHandler('spammer@example.org', 'dear victim', 'receiver@example.org'); - $mailer->addHeader("Content-Type: text/html\r\nFrom: faked@attacker.org"); - } - - /** - * @expectedException InvalidArgumentException - */ - public function testSetterArrayHeaderInjection() - { - $mailer = new NativeMailerHandler('spammer@example.org', 'dear victim', 'receiver@example.org'); - $mailer->addHeader(array("Content-Type: text/html\r\nFrom: faked@attacker.org")); - } - - /** - * @expectedException InvalidArgumentException - */ - public function testSetterContentTypeInjection() - { - $mailer = new NativeMailerHandler('spammer@example.org', 'dear victim', 'receiver@example.org'); - $mailer->setContentType("text/html\r\nFrom: faked@attacker.org"); - } - - /** - * @expectedException InvalidArgumentException - */ - public function testSetterEncodingInjection() - { - $mailer = new NativeMailerHandler('spammer@example.org', 'dear victim', 'receiver@example.org'); - $mailer->setEncoding("utf-8\r\nFrom: faked@attacker.org"); - } - - public function testSend() - { - $to = 'spammer@example.org'; - $subject = 'dear victim'; - $from = 'receiver@example.org'; - - $mailer = new NativeMailerHandler($to, $subject, $from); - $mailer->handleBatch(array()); - - // batch is empty, nothing sent - $this->assertEmpty($GLOBALS['mail']); - - // non-empty batch - $mailer->handle($this->getRecord(Logger::ERROR, "Foo\nBar\r\n\r\nBaz")); - $this->assertNotEmpty($GLOBALS['mail']); - $this->assertInternalType('array', $GLOBALS['mail']); - $this->assertArrayHasKey('0', $GLOBALS['mail']); - $params = $GLOBALS['mail'][0]; - $this->assertCount(5, $params); - $this->assertSame($to, $params[0]); - $this->assertSame($subject, $params[1]); - $this->assertStringEndsWith(" test.ERROR: Foo Bar Baz [] []\n", $params[2]); - $this->assertSame("From: $from\r\nContent-type: text/plain; charset=utf-8\r\n", $params[3]); - $this->assertSame('', $params[4]); - } - - public function testMessageSubjectFormatting() - { - $mailer = new NativeMailerHandler('to@example.org', 'Alert: %level_name% %message%', 'from@example.org'); - $mailer->handle($this->getRecord(Logger::ERROR, "Foo\nBar\r\n\r\nBaz")); - $this->assertNotEmpty($GLOBALS['mail']); - $this->assertInternalType('array', $GLOBALS['mail']); - $this->assertArrayHasKey('0', $GLOBALS['mail']); - $params = $GLOBALS['mail'][0]; - $this->assertCount(5, $params); - $this->assertSame('Alert: ERROR Foo Bar Baz', $params[1]); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/NewRelicHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/NewRelicHandlerTest.php deleted file mode 100644 index 4d3a615..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/NewRelicHandlerTest.php +++ /dev/null @@ -1,200 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\Formatter\LineFormatter; -use Monolog\TestCase; -use Monolog\Logger; - -class NewRelicHandlerTest extends TestCase -{ - public static $appname; - public static $customParameters; - public static $transactionName; - - public function setUp() - { - self::$appname = null; - self::$customParameters = array(); - self::$transactionName = null; - } - - /** - * @expectedException Monolog\Handler\MissingExtensionException - */ - public function testThehandlerThrowsAnExceptionIfTheNRExtensionIsNotLoaded() - { - $handler = new StubNewRelicHandlerWithoutExtension(); - $handler->handle($this->getRecord(Logger::ERROR)); - } - - public function testThehandlerCanHandleTheRecord() - { - $handler = new StubNewRelicHandler(); - $handler->handle($this->getRecord(Logger::ERROR)); - } - - public function testThehandlerCanAddContextParamsToTheNewRelicTrace() - { - $handler = new StubNewRelicHandler(); - $handler->handle($this->getRecord(Logger::ERROR, 'log message', array('a' => 'b'))); - $this->assertEquals(array('context_a' => 'b'), self::$customParameters); - } - - public function testThehandlerCanAddExplodedContextParamsToTheNewRelicTrace() - { - $handler = new StubNewRelicHandler(Logger::ERROR, true, self::$appname, true); - $handler->handle($this->getRecord( - Logger::ERROR, - 'log message', - array('a' => array('key1' => 'value1', 'key2' => 'value2')) - )); - $this->assertEquals( - array('context_a_key1' => 'value1', 'context_a_key2' => 'value2'), - self::$customParameters - ); - } - - public function testThehandlerCanAddExtraParamsToTheNewRelicTrace() - { - $record = $this->getRecord(Logger::ERROR, 'log message'); - $record['extra'] = array('c' => 'd'); - - $handler = new StubNewRelicHandler(); - $handler->handle($record); - - $this->assertEquals(array('extra_c' => 'd'), self::$customParameters); - } - - public function testThehandlerCanAddExplodedExtraParamsToTheNewRelicTrace() - { - $record = $this->getRecord(Logger::ERROR, 'log message'); - $record['extra'] = array('c' => array('key1' => 'value1', 'key2' => 'value2')); - - $handler = new StubNewRelicHandler(Logger::ERROR, true, self::$appname, true); - $handler->handle($record); - - $this->assertEquals( - array('extra_c_key1' => 'value1', 'extra_c_key2' => 'value2'), - self::$customParameters - ); - } - - public function testThehandlerCanAddExtraContextAndParamsToTheNewRelicTrace() - { - $record = $this->getRecord(Logger::ERROR, 'log message', array('a' => 'b')); - $record['extra'] = array('c' => 'd'); - - $handler = new StubNewRelicHandler(); - $handler->handle($record); - - $expected = array( - 'context_a' => 'b', - 'extra_c' => 'd', - ); - - $this->assertEquals($expected, self::$customParameters); - } - - public function testThehandlerCanHandleTheRecordsFormattedUsingTheLineFormatter() - { - $handler = new StubNewRelicHandler(); - $handler->setFormatter(new LineFormatter()); - $handler->handle($this->getRecord(Logger::ERROR)); - } - - public function testTheAppNameIsNullByDefault() - { - $handler = new StubNewRelicHandler(); - $handler->handle($this->getRecord(Logger::ERROR, 'log message')); - - $this->assertEquals(null, self::$appname); - } - - public function testTheAppNameCanBeInjectedFromtheConstructor() - { - $handler = new StubNewRelicHandler(Logger::DEBUG, false, 'myAppName'); - $handler->handle($this->getRecord(Logger::ERROR, 'log message')); - - $this->assertEquals('myAppName', self::$appname); - } - - public function testTheAppNameCanBeOverriddenFromEachLog() - { - $handler = new StubNewRelicHandler(Logger::DEBUG, false, 'myAppName'); - $handler->handle($this->getRecord(Logger::ERROR, 'log message', array('appname' => 'logAppName'))); - - $this->assertEquals('logAppName', self::$appname); - } - - public function testTheTransactionNameIsNullByDefault() - { - $handler = new StubNewRelicHandler(); - $handler->handle($this->getRecord(Logger::ERROR, 'log message')); - - $this->assertEquals(null, self::$transactionName); - } - - public function testTheTransactionNameCanBeInjectedFromTheConstructor() - { - $handler = new StubNewRelicHandler(Logger::DEBUG, false, null, false, 'myTransaction'); - $handler->handle($this->getRecord(Logger::ERROR, 'log message')); - - $this->assertEquals('myTransaction', self::$transactionName); - } - - public function testTheTransactionNameCanBeOverriddenFromEachLog() - { - $handler = new StubNewRelicHandler(Logger::DEBUG, false, null, false, 'myTransaction'); - $handler->handle($this->getRecord(Logger::ERROR, 'log message', array('transaction_name' => 'logTransactName'))); - - $this->assertEquals('logTransactName', self::$transactionName); - } -} - -class StubNewRelicHandlerWithoutExtension extends NewRelicHandler -{ - protected function isNewRelicEnabled() - { - return false; - } -} - -class StubNewRelicHandler extends NewRelicHandler -{ - protected function isNewRelicEnabled() - { - return true; - } -} - -function newrelic_notice_error() -{ - return true; -} - -function newrelic_set_appname($appname) -{ - return NewRelicHandlerTest::$appname = $appname; -} - -function newrelic_name_transaction($transactionName) -{ - return NewRelicHandlerTest::$transactionName = $transactionName; -} - -function newrelic_add_custom_parameter($key, $value) -{ - NewRelicHandlerTest::$customParameters[$key] = $value; - - return true; -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/NullHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/NullHandlerTest.php deleted file mode 100644 index 292df78..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/NullHandlerTest.php +++ /dev/null @@ -1,33 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; -use Monolog\Logger; - -/** - * @covers Monolog\Handler\NullHandler::handle - */ -class NullHandlerTest extends TestCase -{ - public function testHandle() - { - $handler = new NullHandler(); - $this->assertTrue($handler->handle($this->getRecord())); - } - - public function testHandleLowerLevelRecord() - { - $handler = new NullHandler(Logger::WARNING); - $this->assertFalse($handler->handle($this->getRecord(Logger::DEBUG))); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/PHPConsoleHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/PHPConsoleHandlerTest.php deleted file mode 100644 index 152573e..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/PHPConsoleHandlerTest.php +++ /dev/null @@ -1,273 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Exception; -use Monolog\ErrorHandler; -use Monolog\Logger; -use Monolog\TestCase; -use PhpConsole\Connector; -use PhpConsole\Dispatcher\Debug as DebugDispatcher; -use PhpConsole\Dispatcher\Errors as ErrorDispatcher; -use PhpConsole\Handler; -use PHPUnit_Framework_MockObject_MockObject; - -/** - * @covers Monolog\Handler\PHPConsoleHandler - * @author Sergey Barbushin https://www.linkedin.com/in/barbushin - */ -class PHPConsoleHandlerTest extends TestCase -{ - /** @var Connector|PHPUnit_Framework_MockObject_MockObject */ - protected $connector; - /** @var DebugDispatcher|PHPUnit_Framework_MockObject_MockObject */ - protected $debugDispatcher; - /** @var ErrorDispatcher|PHPUnit_Framework_MockObject_MockObject */ - protected $errorDispatcher; - - protected function setUp() - { - if (!class_exists('PhpConsole\Connector')) { - $this->markTestSkipped('PHP Console library not found. See https://github.com/barbushin/php-console#installation'); - } - $this->connector = $this->initConnectorMock(); - - $this->debugDispatcher = $this->initDebugDispatcherMock($this->connector); - $this->connector->setDebugDispatcher($this->debugDispatcher); - - $this->errorDispatcher = $this->initErrorDispatcherMock($this->connector); - $this->connector->setErrorsDispatcher($this->errorDispatcher); - } - - protected function initDebugDispatcherMock(Connector $connector) - { - return $this->getMockBuilder('PhpConsole\Dispatcher\Debug') - ->disableOriginalConstructor() - ->setMethods(array('dispatchDebug')) - ->setConstructorArgs(array($connector, $connector->getDumper())) - ->getMock(); - } - - protected function initErrorDispatcherMock(Connector $connector) - { - return $this->getMockBuilder('PhpConsole\Dispatcher\Errors') - ->disableOriginalConstructor() - ->setMethods(array('dispatchError', 'dispatchException')) - ->setConstructorArgs(array($connector, $connector->getDumper())) - ->getMock(); - } - - protected function initConnectorMock() - { - $connector = $this->getMockBuilder('PhpConsole\Connector') - ->disableOriginalConstructor() - ->setMethods(array( - 'sendMessage', - 'onShutDown', - 'isActiveClient', - 'setSourcesBasePath', - 'setServerEncoding', - 'setPassword', - 'enableSslOnlyMode', - 'setAllowedIpMasks', - 'setHeadersLimit', - 'startEvalRequestsListener', - )) - ->getMock(); - - $connector->expects($this->any()) - ->method('isActiveClient') - ->will($this->returnValue(true)); - - return $connector; - } - - protected function getHandlerDefaultOption($name) - { - $handler = new PHPConsoleHandler(array(), $this->connector); - $options = $handler->getOptions(); - - return $options[$name]; - } - - protected function initLogger($handlerOptions = array(), $level = Logger::DEBUG) - { - return new Logger('test', array( - new PHPConsoleHandler($handlerOptions, $this->connector, $level), - )); - } - - public function testInitWithDefaultConnector() - { - $handler = new PHPConsoleHandler(); - $this->assertEquals(spl_object_hash(Connector::getInstance()), spl_object_hash($handler->getConnector())); - } - - public function testInitWithCustomConnector() - { - $handler = new PHPConsoleHandler(array(), $this->connector); - $this->assertEquals(spl_object_hash($this->connector), spl_object_hash($handler->getConnector())); - } - - public function testDebug() - { - $this->debugDispatcher->expects($this->once())->method('dispatchDebug')->with($this->equalTo('test')); - $this->initLogger()->addDebug('test'); - } - - public function testDebugContextInMessage() - { - $message = 'test'; - $tag = 'tag'; - $context = array($tag, 'custom' => mt_rand()); - $expectedMessage = $message . ' ' . json_encode(array_slice($context, 1)); - $this->debugDispatcher->expects($this->once())->method('dispatchDebug')->with( - $this->equalTo($expectedMessage), - $this->equalTo($tag) - ); - $this->initLogger()->addDebug($message, $context); - } - - public function testDebugTags($tagsContextKeys = null) - { - $expectedTags = mt_rand(); - $logger = $this->initLogger($tagsContextKeys ? array('debugTagsKeysInContext' => $tagsContextKeys) : array()); - if (!$tagsContextKeys) { - $tagsContextKeys = $this->getHandlerDefaultOption('debugTagsKeysInContext'); - } - foreach ($tagsContextKeys as $key) { - $debugDispatcher = $this->initDebugDispatcherMock($this->connector); - $debugDispatcher->expects($this->once())->method('dispatchDebug')->with( - $this->anything(), - $this->equalTo($expectedTags) - ); - $this->connector->setDebugDispatcher($debugDispatcher); - $logger->addDebug('test', array($key => $expectedTags)); - } - } - - public function testError($classesPartialsTraceIgnore = null) - { - $code = E_USER_NOTICE; - $message = 'message'; - $file = __FILE__; - $line = __LINE__; - $this->errorDispatcher->expects($this->once())->method('dispatchError')->with( - $this->equalTo($code), - $this->equalTo($message), - $this->equalTo($file), - $this->equalTo($line), - $classesPartialsTraceIgnore ?: $this->equalTo($this->getHandlerDefaultOption('classesPartialsTraceIgnore')) - ); - $errorHandler = ErrorHandler::register($this->initLogger($classesPartialsTraceIgnore ? array('classesPartialsTraceIgnore' => $classesPartialsTraceIgnore) : array()), false); - $errorHandler->registerErrorHandler(array(), false, E_USER_WARNING); - $errorHandler->handleError($code, $message, $file, $line); - } - - public function testException() - { - $e = new Exception(); - $this->errorDispatcher->expects($this->once())->method('dispatchException')->with( - $this->equalTo($e) - ); - $handler = $this->initLogger(); - $handler->log( - \Psr\Log\LogLevel::ERROR, - sprintf('Uncaught Exception %s: "%s" at %s line %s', get_class($e), $e->getMessage(), $e->getFile(), $e->getLine()), - array('exception' => $e) - ); - } - - /** - * @expectedException Exception - */ - public function testWrongOptionsThrowsException() - { - new PHPConsoleHandler(array('xxx' => 1)); - } - - public function testOptionEnabled() - { - $this->debugDispatcher->expects($this->never())->method('dispatchDebug'); - $this->initLogger(array('enabled' => false))->addDebug('test'); - } - - public function testOptionClassesPartialsTraceIgnore() - { - $this->testError(array('Class', 'Namespace\\')); - } - - public function testOptionDebugTagsKeysInContext() - { - $this->testDebugTags(array('key1', 'key2')); - } - - public function testOptionUseOwnErrorsAndExceptionsHandler() - { - $this->initLogger(array('useOwnErrorsHandler' => true, 'useOwnExceptionsHandler' => true)); - $this->assertEquals(array(Handler::getInstance(), 'handleError'), set_error_handler(function () { - })); - $this->assertEquals(array(Handler::getInstance(), 'handleException'), set_exception_handler(function () { - })); - } - - public static function provideConnectorMethodsOptionsSets() - { - return array( - array('sourcesBasePath', 'setSourcesBasePath', __DIR__), - array('serverEncoding', 'setServerEncoding', 'cp1251'), - array('password', 'setPassword', '******'), - array('enableSslOnlyMode', 'enableSslOnlyMode', true, false), - array('ipMasks', 'setAllowedIpMasks', array('127.0.0.*')), - array('headersLimit', 'setHeadersLimit', 2500), - array('enableEvalListener', 'startEvalRequestsListener', true, false), - ); - } - - /** - * @dataProvider provideConnectorMethodsOptionsSets - */ - public function testOptionCallsConnectorMethod($option, $method, $value, $isArgument = true) - { - $expectCall = $this->connector->expects($this->once())->method($method); - if ($isArgument) { - $expectCall->with($value); - } - new PHPConsoleHandler(array($option => $value), $this->connector); - } - - public function testOptionDetectDumpTraceAndSource() - { - new PHPConsoleHandler(array('detectDumpTraceAndSource' => true), $this->connector); - $this->assertTrue($this->connector->getDebugDispatcher()->detectTraceAndSource); - } - - public static function provideDumperOptionsValues() - { - return array( - array('dumperLevelLimit', 'levelLimit', 1001), - array('dumperItemsCountLimit', 'itemsCountLimit', 1002), - array('dumperItemSizeLimit', 'itemSizeLimit', 1003), - array('dumperDumpSizeLimit', 'dumpSizeLimit', 1004), - array('dumperDetectCallbacks', 'detectCallbacks', true), - ); - } - - /** - * @dataProvider provideDumperOptionsValues - */ - public function testDumperOptions($option, $dumperProperty, $value) - { - new PHPConsoleHandler(array($option => $value), $this->connector); - $this->assertEquals($value, $this->connector->getDumper()->$dumperProperty); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/PsrHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/PsrHandlerTest.php deleted file mode 100644 index 64eaab1..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/PsrHandlerTest.php +++ /dev/null @@ -1,50 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; -use Monolog\Logger; - -/** - * @covers Monolog\Handler\PsrHandler::handle - */ -class PsrHandlerTest extends TestCase -{ - public function logLevelProvider() - { - $levels = array(); - $monologLogger = new Logger(''); - - foreach ($monologLogger->getLevels() as $levelName => $level) { - $levels[] = array($levelName, $level); - } - - return $levels; - } - - /** - * @dataProvider logLevelProvider - */ - public function testHandlesAllLevels($levelName, $level) - { - $message = 'Hello, world! ' . $level; - $context = array('foo' => 'bar', 'level' => $level); - - $psrLogger = $this->getMock('Psr\Log\NullLogger'); - $psrLogger->expects($this->once()) - ->method('log') - ->with(strtolower($levelName), $message, $context); - - $handler = new PsrHandler($psrLogger); - $handler->handle(array('level' => $level, 'level_name' => $levelName, 'message' => $message, 'context' => $context)); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/PushoverHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/PushoverHandlerTest.php deleted file mode 100644 index 56df474..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/PushoverHandlerTest.php +++ /dev/null @@ -1,141 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; -use Monolog\Logger; - -/** - * Almost all examples (expected header, titles, messages) taken from - * https://www.pushover.net/api - * @author Sebastian Göttschkes - * @see https://www.pushover.net/api - */ -class PushoverHandlerTest extends TestCase -{ - private $res; - private $handler; - - public function testWriteHeader() - { - $this->createHandler(); - $this->handler->setHighPriorityLevel(Logger::EMERGENCY); // skip priority notifications - $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1')); - fseek($this->res, 0); - $content = fread($this->res, 1024); - - $this->assertRegexp('/POST \/1\/messages.json HTTP\/1.1\\r\\nHost: api.pushover.net\\r\\nContent-Type: application\/x-www-form-urlencoded\\r\\nContent-Length: \d{2,4}\\r\\n\\r\\n/', $content); - - return $content; - } - - /** - * @depends testWriteHeader - */ - public function testWriteContent($content) - { - $this->assertRegexp('/token=myToken&user=myUser&message=test1&title=Monolog×tamp=\d{10}$/', $content); - } - - public function testWriteWithComplexTitle() - { - $this->createHandler('myToken', 'myUser', 'Backup finished - SQL1'); - $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1')); - fseek($this->res, 0); - $content = fread($this->res, 1024); - - $this->assertRegexp('/title=Backup\+finished\+-\+SQL1/', $content); - } - - public function testWriteWithComplexMessage() - { - $this->createHandler(); - $this->handler->setHighPriorityLevel(Logger::EMERGENCY); // skip priority notifications - $this->handler->handle($this->getRecord(Logger::CRITICAL, 'Backup of database "example" finished in 16 minutes.')); - fseek($this->res, 0); - $content = fread($this->res, 1024); - - $this->assertRegexp('/message=Backup\+of\+database\+%22example%22\+finished\+in\+16\+minutes\./', $content); - } - - public function testWriteWithTooLongMessage() - { - $message = str_pad('test', 520, 'a'); - $this->createHandler(); - $this->handler->setHighPriorityLevel(Logger::EMERGENCY); // skip priority notifications - $this->handler->handle($this->getRecord(Logger::CRITICAL, $message)); - fseek($this->res, 0); - $content = fread($this->res, 1024); - - $expectedMessage = substr($message, 0, 505); - - $this->assertRegexp('/message=' . $expectedMessage . '&title/', $content); - } - - public function testWriteWithHighPriority() - { - $this->createHandler(); - $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1')); - fseek($this->res, 0); - $content = fread($this->res, 1024); - - $this->assertRegexp('/token=myToken&user=myUser&message=test1&title=Monolog×tamp=\d{10}&priority=1$/', $content); - } - - public function testWriteWithEmergencyPriority() - { - $this->createHandler(); - $this->handler->handle($this->getRecord(Logger::EMERGENCY, 'test1')); - fseek($this->res, 0); - $content = fread($this->res, 1024); - - $this->assertRegexp('/token=myToken&user=myUser&message=test1&title=Monolog×tamp=\d{10}&priority=2&retry=30&expire=25200$/', $content); - } - - public function testWriteToMultipleUsers() - { - $this->createHandler('myToken', array('userA', 'userB')); - $this->handler->handle($this->getRecord(Logger::EMERGENCY, 'test1')); - fseek($this->res, 0); - $content = fread($this->res, 1024); - - $this->assertRegexp('/token=myToken&user=userA&message=test1&title=Monolog×tamp=\d{10}&priority=2&retry=30&expire=25200POST/', $content); - $this->assertRegexp('/token=myToken&user=userB&message=test1&title=Monolog×tamp=\d{10}&priority=2&retry=30&expire=25200$/', $content); - } - - private function createHandler($token = 'myToken', $user = 'myUser', $title = 'Monolog') - { - $constructorArgs = array($token, $user, $title); - $this->res = fopen('php://memory', 'a'); - $this->handler = $this->getMock( - '\Monolog\Handler\PushoverHandler', - array('fsockopen', 'streamSetTimeout', 'closeSocket'), - $constructorArgs - ); - - $reflectionProperty = new \ReflectionProperty('\Monolog\Handler\SocketHandler', 'connectionString'); - $reflectionProperty->setAccessible(true); - $reflectionProperty->setValue($this->handler, 'localhost:1234'); - - $this->handler->expects($this->any()) - ->method('fsockopen') - ->will($this->returnValue($this->res)); - $this->handler->expects($this->any()) - ->method('streamSetTimeout') - ->will($this->returnValue(true)); - $this->handler->expects($this->any()) - ->method('closeSocket') - ->will($this->returnValue(true)); - - $this->handler->setFormatter($this->getIdentityFormatter()); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/RavenHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/RavenHandlerTest.php deleted file mode 100644 index 26d212b..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/RavenHandlerTest.php +++ /dev/null @@ -1,255 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; -use Monolog\Logger; -use Monolog\Formatter\LineFormatter; - -class RavenHandlerTest extends TestCase -{ - public function setUp() - { - if (!class_exists('Raven_Client')) { - $this->markTestSkipped('raven/raven not installed'); - } - - require_once __DIR__ . '/MockRavenClient.php'; - } - - /** - * @covers Monolog\Handler\RavenHandler::__construct - */ - public function testConstruct() - { - $handler = new RavenHandler($this->getRavenClient()); - $this->assertInstanceOf('Monolog\Handler\RavenHandler', $handler); - } - - protected function getHandler($ravenClient) - { - $handler = new RavenHandler($ravenClient); - - return $handler; - } - - protected function getRavenClient() - { - $dsn = 'http://43f6017361224d098402974103bfc53d:a6a0538fc2934ba2bed32e08741b2cd3@marca.python.live.cheggnet.com:9000/1'; - - return new MockRavenClient($dsn); - } - - public function testDebug() - { - $ravenClient = $this->getRavenClient(); - $handler = $this->getHandler($ravenClient); - - $record = $this->getRecord(Logger::DEBUG, 'A test debug message'); - $handler->handle($record); - - $this->assertEquals($ravenClient::DEBUG, $ravenClient->lastData['level']); - $this->assertContains($record['message'], $ravenClient->lastData['message']); - } - - public function testWarning() - { - $ravenClient = $this->getRavenClient(); - $handler = $this->getHandler($ravenClient); - - $record = $this->getRecord(Logger::WARNING, 'A test warning message'); - $handler->handle($record); - - $this->assertEquals($ravenClient::WARNING, $ravenClient->lastData['level']); - $this->assertContains($record['message'], $ravenClient->lastData['message']); - } - - public function testTag() - { - $ravenClient = $this->getRavenClient(); - $handler = $this->getHandler($ravenClient); - - $tags = array(1, 2, 'foo'); - $record = $this->getRecord(Logger::INFO, 'test', array('tags' => $tags)); - $handler->handle($record); - - $this->assertEquals($tags, $ravenClient->lastData['tags']); - } - - public function testExtraParameters() - { - $ravenClient = $this->getRavenClient(); - $handler = $this->getHandler($ravenClient); - - $checksum = '098f6bcd4621d373cade4e832627b4f6'; - $release = '05a671c66aefea124cc08b76ea6d30bb'; - $eventId = '31423'; - $record = $this->getRecord(Logger::INFO, 'test', array('checksum' => $checksum, 'release' => $release, 'event_id' => $eventId)); - $handler->handle($record); - - $this->assertEquals($checksum, $ravenClient->lastData['checksum']); - $this->assertEquals($release, $ravenClient->lastData['release']); - $this->assertEquals($eventId, $ravenClient->lastData['event_id']); - } - - public function testFingerprint() - { - $ravenClient = $this->getRavenClient(); - $handler = $this->getHandler($ravenClient); - - $fingerprint = array('{{ default }}', 'other value'); - $record = $this->getRecord(Logger::INFO, 'test', array('fingerprint' => $fingerprint)); - $handler->handle($record); - - $this->assertEquals($fingerprint, $ravenClient->lastData['fingerprint']); - } - - public function testUserContext() - { - $ravenClient = $this->getRavenClient(); - $handler = $this->getHandler($ravenClient); - - $recordWithNoContext = $this->getRecord(Logger::INFO, 'test with default user context'); - // set user context 'externally' - - $user = array( - 'id' => '123', - 'email' => 'test@test.com', - ); - - $recordWithContext = $this->getRecord(Logger::INFO, 'test', array('user' => $user)); - - $ravenClient->user_context(array('id' => 'test_user_id')); - // handle context - $handler->handle($recordWithContext); - $this->assertEquals($user, $ravenClient->lastData['user']); - - // check to see if its reset - $handler->handle($recordWithNoContext); - $this->assertInternalType('array', $ravenClient->context->user); - $this->assertSame('test_user_id', $ravenClient->context->user['id']); - - // handle with null context - $ravenClient->user_context(null); - $handler->handle($recordWithContext); - $this->assertEquals($user, $ravenClient->lastData['user']); - - // check to see if its reset - $handler->handle($recordWithNoContext); - $this->assertNull($ravenClient->context->user); - } - - public function testException() - { - $ravenClient = $this->getRavenClient(); - $handler = $this->getHandler($ravenClient); - - try { - $this->methodThatThrowsAnException(); - } catch (\Exception $e) { - $record = $this->getRecord(Logger::ERROR, $e->getMessage(), array('exception' => $e)); - $handler->handle($record); - } - - $this->assertEquals($record['message'], $ravenClient->lastData['message']); - } - - public function testHandleBatch() - { - $records = $this->getMultipleRecords(); - $records[] = $this->getRecord(Logger::WARNING, 'warning'); - $records[] = $this->getRecord(Logger::WARNING, 'warning'); - - $logFormatter = $this->getMock('Monolog\\Formatter\\FormatterInterface'); - $logFormatter->expects($this->once())->method('formatBatch'); - - $formatter = $this->getMock('Monolog\\Formatter\\FormatterInterface'); - $formatter->expects($this->once())->method('format')->with($this->callback(function ($record) { - return $record['level'] == 400; - })); - - $handler = $this->getHandler($this->getRavenClient()); - $handler->setBatchFormatter($logFormatter); - $handler->setFormatter($formatter); - $handler->handleBatch($records); - } - - public function testHandleBatchDoNothingIfRecordsAreBelowLevel() - { - $records = array( - $this->getRecord(Logger::DEBUG, 'debug message 1'), - $this->getRecord(Logger::DEBUG, 'debug message 2'), - $this->getRecord(Logger::INFO, 'information'), - ); - - $handler = $this->getMock('Monolog\Handler\RavenHandler', null, array($this->getRavenClient())); - $handler->expects($this->never())->method('handle'); - $handler->setLevel(Logger::ERROR); - $handler->handleBatch($records); - } - - public function testHandleBatchPicksProperMessage() - { - $records = array( - $this->getRecord(Logger::DEBUG, 'debug message 1'), - $this->getRecord(Logger::DEBUG, 'debug message 2'), - $this->getRecord(Logger::INFO, 'information 1'), - $this->getRecord(Logger::ERROR, 'error 1'), - $this->getRecord(Logger::WARNING, 'warning'), - $this->getRecord(Logger::ERROR, 'error 2'), - $this->getRecord(Logger::INFO, 'information 2'), - ); - - $logFormatter = $this->getMock('Monolog\\Formatter\\FormatterInterface'); - $logFormatter->expects($this->once())->method('formatBatch'); - - $formatter = $this->getMock('Monolog\\Formatter\\FormatterInterface'); - $formatter->expects($this->once())->method('format')->with($this->callback(function ($record) use ($records) { - return $record['message'] == 'error 1'; - })); - - $handler = $this->getHandler($this->getRavenClient()); - $handler->setBatchFormatter($logFormatter); - $handler->setFormatter($formatter); - $handler->handleBatch($records); - } - - public function testGetSetBatchFormatter() - { - $ravenClient = $this->getRavenClient(); - $handler = $this->getHandler($ravenClient); - - $handler->setBatchFormatter($formatter = new LineFormatter()); - $this->assertSame($formatter, $handler->getBatchFormatter()); - } - - public function testRelease() - { - $ravenClient = $this->getRavenClient(); - $handler = $this->getHandler($ravenClient); - $release = 'v42.42.42'; - $handler->setRelease($release); - $record = $this->getRecord(Logger::INFO, 'test'); - $handler->handle($record); - $this->assertEquals($release, $ravenClient->lastData['release']); - - $localRelease = 'v41.41.41'; - $record = $this->getRecord(Logger::INFO, 'test', array('release' => $localRelease)); - $handler->handle($record); - $this->assertEquals($localRelease, $ravenClient->lastData['release']); - } - - private function methodThatThrowsAnException() - { - throw new \Exception('This is an exception'); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/RedisHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/RedisHandlerTest.php deleted file mode 100644 index 689d527..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/RedisHandlerTest.php +++ /dev/null @@ -1,127 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; -use Monolog\Logger; -use Monolog\Formatter\LineFormatter; - -class RedisHandlerTest extends TestCase -{ - /** - * @expectedException InvalidArgumentException - */ - public function testConstructorShouldThrowExceptionForInvalidRedis() - { - new RedisHandler(new \stdClass(), 'key'); - } - - public function testConstructorShouldWorkWithPredis() - { - $redis = $this->getMock('Predis\Client'); - $this->assertInstanceof('Monolog\Handler\RedisHandler', new RedisHandler($redis, 'key')); - } - - public function testConstructorShouldWorkWithRedis() - { - $redis = $this->getMock('Redis'); - $this->assertInstanceof('Monolog\Handler\RedisHandler', new RedisHandler($redis, 'key')); - } - - public function testPredisHandle() - { - $redis = $this->getMock('Predis\Client', array('rpush')); - - // Predis\Client uses rpush - $redis->expects($this->once()) - ->method('rpush') - ->with('key', 'test'); - - $record = $this->getRecord(Logger::WARNING, 'test', array('data' => new \stdClass, 'foo' => 34)); - - $handler = new RedisHandler($redis, 'key'); - $handler->setFormatter(new LineFormatter("%message%")); - $handler->handle($record); - } - - public function testRedisHandle() - { - $redis = $this->getMock('Redis', array('rpush')); - - // Redis uses rPush - $redis->expects($this->once()) - ->method('rPush') - ->with('key', 'test'); - - $record = $this->getRecord(Logger::WARNING, 'test', array('data' => new \stdClass, 'foo' => 34)); - - $handler = new RedisHandler($redis, 'key'); - $handler->setFormatter(new LineFormatter("%message%")); - $handler->handle($record); - } - - public function testRedisHandleCapped() - { - $redis = $this->getMock('Redis', array('multi', 'rpush', 'ltrim', 'exec')); - - // Redis uses multi - $redis->expects($this->once()) - ->method('multi') - ->will($this->returnSelf()); - - $redis->expects($this->once()) - ->method('rpush') - ->will($this->returnSelf()); - - $redis->expects($this->once()) - ->method('ltrim') - ->will($this->returnSelf()); - - $redis->expects($this->once()) - ->method('exec') - ->will($this->returnSelf()); - - $record = $this->getRecord(Logger::WARNING, 'test', array('data' => new \stdClass, 'foo' => 34)); - - $handler = new RedisHandler($redis, 'key', Logger::DEBUG, true, 10); - $handler->setFormatter(new LineFormatter("%message%")); - $handler->handle($record); - } - - public function testPredisHandleCapped() - { - $redis = $this->getMock('Predis\Client', array('transaction')); - - $redisTransaction = $this->getMock('Predis\Client', array('rpush', 'ltrim')); - - $redisTransaction->expects($this->once()) - ->method('rpush') - ->will($this->returnSelf()); - - $redisTransaction->expects($this->once()) - ->method('ltrim') - ->will($this->returnSelf()); - - // Redis uses multi - $redis->expects($this->once()) - ->method('transaction') - ->will($this->returnCallback(function ($cb) use ($redisTransaction) { - $cb($redisTransaction); - })); - - $record = $this->getRecord(Logger::WARNING, 'test', array('data' => new \stdClass, 'foo' => 34)); - - $handler = new RedisHandler($redis, 'key', Logger::DEBUG, true, 10); - $handler->setFormatter(new LineFormatter("%message%")); - $handler->handle($record); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/RollbarHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/RollbarHandlerTest.php deleted file mode 100644 index f302e91..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/RollbarHandlerTest.php +++ /dev/null @@ -1,84 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Exception; -use Monolog\TestCase; -use Monolog\Logger; -use PHPUnit_Framework_MockObject_MockObject as MockObject; - -/** - * @author Erik Johansson - * @see https://rollbar.com/docs/notifier/rollbar-php/ - * - * @coversDefaultClass Monolog\Handler\RollbarHandler - */ -class RollbarHandlerTest extends TestCase -{ - /** - * @var MockObject - */ - private $rollbarNotifier; - - /** - * @var array - */ - public $reportedExceptionArguments = null; - - protected function setUp() - { - parent::setUp(); - - $this->setupRollbarNotifierMock(); - } - - /** - * When reporting exceptions to Rollbar the - * level has to be set in the payload data - */ - public function testExceptionLogLevel() - { - $handler = $this->createHandler(); - - $handler->handle($this->createExceptionRecord(Logger::DEBUG)); - - $this->assertEquals('debug', $this->reportedExceptionArguments['payload']['level']); - } - - private function setupRollbarNotifierMock() - { - $this->rollbarNotifier = $this->getMockBuilder('RollbarNotifier') - ->setMethods(array('report_message', 'report_exception', 'flush')) - ->getMock(); - - $that = $this; - - $this->rollbarNotifier - ->expects($this->any()) - ->method('report_exception') - ->willReturnCallback(function ($exception, $context, $payload) use ($that) { - $that->reportedExceptionArguments = compact('exception', 'context', 'payload'); - }); - } - - private function createHandler() - { - return new RollbarHandler($this->rollbarNotifier, Logger::DEBUG); - } - - private function createExceptionRecord($level = Logger::DEBUG, $message = 'test', $exception = null) - { - return $this->getRecord($level, $message, array( - 'exception' => $exception ?: new Exception() - )); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/RotatingFileHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/RotatingFileHandlerTest.php deleted file mode 100644 index c6f5fac..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/RotatingFileHandlerTest.php +++ /dev/null @@ -1,245 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; -use PHPUnit_Framework_Error_Deprecated; - -/** - * @covers Monolog\Handler\RotatingFileHandler - */ -class RotatingFileHandlerTest extends TestCase -{ - /** - * This var should be private but then the anonymous function - * in the `setUp` method won't be able to set it. `$this` cant't - * be used in the anonymous function in `setUp` because PHP 5.3 - * does not support it. - */ - public $lastError; - - public function setUp() - { - $dir = __DIR__.'/Fixtures'; - chmod($dir, 0777); - if (!is_writable($dir)) { - $this->markTestSkipped($dir.' must be writable to test the RotatingFileHandler.'); - } - $this->lastError = null; - $self = $this; - // workaround with &$self used for PHP 5.3 - set_error_handler(function($code, $message) use (&$self) { - $self->lastError = array( - 'code' => $code, - 'message' => $message, - ); - }); - } - - private function assertErrorWasTriggered($code, $message) - { - if (empty($this->lastError)) { - $this->fail( - sprintf( - 'Failed asserting that error with code `%d` and message `%s` was triggered', - $code, - $message - ) - ); - } - $this->assertEquals($code, $this->lastError['code'], sprintf('Expected an error with code %d to be triggered, got `%s` instead', $code, $this->lastError['code'])); - $this->assertEquals($message, $this->lastError['message'], sprintf('Expected an error with message `%d` to be triggered, got `%s` instead', $message, $this->lastError['message'])); - } - - public function testRotationCreatesNewFile() - { - touch(__DIR__.'/Fixtures/foo-'.date('Y-m-d', time() - 86400).'.rot'); - - $handler = new RotatingFileHandler(__DIR__.'/Fixtures/foo.rot'); - $handler->setFormatter($this->getIdentityFormatter()); - $handler->handle($this->getRecord()); - - $log = __DIR__.'/Fixtures/foo-'.date('Y-m-d').'.rot'; - $this->assertTrue(file_exists($log)); - $this->assertEquals('test', file_get_contents($log)); - } - - /** - * @dataProvider rotationTests - */ - public function testRotation($createFile, $dateFormat, $timeCallback) - { - touch($old1 = __DIR__.'/Fixtures/foo-'.date($dateFormat, $timeCallback(-1)).'.rot'); - touch($old2 = __DIR__.'/Fixtures/foo-'.date($dateFormat, $timeCallback(-2)).'.rot'); - touch($old3 = __DIR__.'/Fixtures/foo-'.date($dateFormat, $timeCallback(-3)).'.rot'); - touch($old4 = __DIR__.'/Fixtures/foo-'.date($dateFormat, $timeCallback(-4)).'.rot'); - - $log = __DIR__.'/Fixtures/foo-'.date($dateFormat).'.rot'; - - if ($createFile) { - touch($log); - } - - $handler = new RotatingFileHandler(__DIR__.'/Fixtures/foo.rot', 2); - $handler->setFormatter($this->getIdentityFormatter()); - $handler->setFilenameFormat('{filename}-{date}', $dateFormat); - $handler->handle($this->getRecord()); - - $handler->close(); - - $this->assertTrue(file_exists($log)); - $this->assertTrue(file_exists($old1)); - $this->assertEquals($createFile, file_exists($old2)); - $this->assertEquals($createFile, file_exists($old3)); - $this->assertEquals($createFile, file_exists($old4)); - $this->assertEquals('test', file_get_contents($log)); - } - - public function rotationTests() - { - $now = time(); - $dayCallback = function($ago) use ($now) { - return $now + 86400 * $ago; - }; - $monthCallback = function($ago) { - return gmmktime(0, 0, 0, date('n') + $ago, 1, date('Y')); - }; - $yearCallback = function($ago) { - return gmmktime(0, 0, 0, 1, 1, date('Y') + $ago); - }; - - return array( - 'Rotation is triggered when the file of the current day is not present' - => array(true, RotatingFileHandler::FILE_PER_DAY, $dayCallback), - 'Rotation is not triggered when the file of the current day is already present' - => array(false, RotatingFileHandler::FILE_PER_DAY, $dayCallback), - - 'Rotation is triggered when the file of the current month is not present' - => array(true, RotatingFileHandler::FILE_PER_MONTH, $monthCallback), - 'Rotation is not triggered when the file of the current month is already present' - => array(false, RotatingFileHandler::FILE_PER_MONTH, $monthCallback), - - 'Rotation is triggered when the file of the current year is not present' - => array(true, RotatingFileHandler::FILE_PER_YEAR, $yearCallback), - 'Rotation is not triggered when the file of the current year is already present' - => array(false, RotatingFileHandler::FILE_PER_YEAR, $yearCallback), - ); - } - - /** - * @dataProvider dateFormatProvider - */ - public function testAllowOnlyFixedDefinedDateFormats($dateFormat, $valid) - { - $handler = new RotatingFileHandler(__DIR__.'/Fixtures/foo.rot', 2); - $handler->setFilenameFormat('{filename}-{date}', $dateFormat); - if (!$valid) { - $this->assertErrorWasTriggered( - E_USER_DEPRECATED, - 'Invalid date format - format must be one of RotatingFileHandler::FILE_PER_DAY ("Y-m-d"), '. - 'RotatingFileHandler::FILE_PER_MONTH ("Y-m") or RotatingFileHandler::FILE_PER_YEAR ("Y"), '. - 'or you can set one of the date formats using slashes, underscores and/or dots instead of dashes.' - ); - } - } - - public function dateFormatProvider() - { - return array( - array(RotatingFileHandler::FILE_PER_DAY, true), - array(RotatingFileHandler::FILE_PER_MONTH, true), - array(RotatingFileHandler::FILE_PER_YEAR, true), - array('m-d-Y', false), - array('Y-m-d-h-i', false) - ); - } - - /** - * @dataProvider filenameFormatProvider - */ - public function testDisallowFilenameFormatsWithoutDate($filenameFormat, $valid) - { - $handler = new RotatingFileHandler(__DIR__.'/Fixtures/foo.rot', 2); - $handler->setFilenameFormat($filenameFormat, RotatingFileHandler::FILE_PER_DAY); - if (!$valid) { - $this->assertErrorWasTriggered( - E_USER_DEPRECATED, - 'Invalid filename format - format should contain at least `{date}`, because otherwise rotating is impossible.' - ); - } - } - - public function filenameFormatProvider() - { - return array( - array('{filename}', false), - array('{filename}-{date}', true), - array('{date}', true), - array('foobar-{date}', true), - array('foo-{date}-bar', true), - array('{date}-foobar', true), - array('foobar', false), - ); - } - - /** - * @dataProvider rotationWhenSimilarFilesExistTests - */ - public function testRotationWhenSimilarFileNamesExist($dateFormat) - { - touch($old1 = __DIR__.'/Fixtures/foo-foo-'.date($dateFormat).'.rot'); - touch($old2 = __DIR__.'/Fixtures/foo-bar-'.date($dateFormat).'.rot'); - - $log = __DIR__.'/Fixtures/foo-'.date($dateFormat).'.rot'; - - $handler = new RotatingFileHandler(__DIR__.'/Fixtures/foo.rot', 2); - $handler->setFormatter($this->getIdentityFormatter()); - $handler->setFilenameFormat('{filename}-{date}', $dateFormat); - $handler->handle($this->getRecord()); - $handler->close(); - - $this->assertTrue(file_exists($log)); - } - - public function rotationWhenSimilarFilesExistTests() - { - - return array( - 'Rotation is triggered when the file of the current day is not present but similar exists' - => array(RotatingFileHandler::FILE_PER_DAY), - - 'Rotation is triggered when the file of the current month is not present but similar exists' - => array(RotatingFileHandler::FILE_PER_MONTH), - - 'Rotation is triggered when the file of the current year is not present but similar exists' - => array(RotatingFileHandler::FILE_PER_YEAR), - ); - } - - public function testReuseCurrentFile() - { - $log = __DIR__.'/Fixtures/foo-'.date('Y-m-d').'.rot'; - file_put_contents($log, "foo"); - $handler = new RotatingFileHandler(__DIR__.'/Fixtures/foo.rot'); - $handler->setFormatter($this->getIdentityFormatter()); - $handler->handle($this->getRecord()); - $this->assertEquals('footest', file_get_contents($log)); - } - - public function tearDown() - { - foreach (glob(__DIR__.'/Fixtures/*.rot') as $file) { - unlink($file); - } - restore_error_handler(); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/SamplingHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/SamplingHandlerTest.php deleted file mode 100644 index b354cee..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/SamplingHandlerTest.php +++ /dev/null @@ -1,33 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; - -/** - * @covers Monolog\Handler\SamplingHandler::handle - */ -class SamplingHandlerTest extends TestCase -{ - public function testHandle() - { - $testHandler = new TestHandler(); - $handler = new SamplingHandler($testHandler, 2); - for ($i = 0; $i < 10000; $i++) { - $handler->handle($this->getRecord()); - } - $count = count($testHandler->getRecords()); - // $count should be half of 10k, so between 4k and 6k - $this->assertLessThan(6000, $count); - $this->assertGreaterThan(4000, $count); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/Slack/SlackRecordTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/Slack/SlackRecordTest.php deleted file mode 100644 index b9de736..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/Slack/SlackRecordTest.php +++ /dev/null @@ -1,395 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler\Slack; - -use Monolog\Logger; -use Monolog\TestCase; - -/** - * @coversDefaultClass Monolog\Handler\Slack\SlackRecord - */ -class SlackRecordTest extends TestCase -{ - private $jsonPrettyPrintFlag; - - protected function setUp() - { - $this->jsonPrettyPrintFlag = defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 128; - } - - public function dataGetAttachmentColor() - { - return array( - array(Logger::DEBUG, SlackRecord::COLOR_DEFAULT), - array(Logger::INFO, SlackRecord::COLOR_GOOD), - array(Logger::NOTICE, SlackRecord::COLOR_GOOD), - array(Logger::WARNING, SlackRecord::COLOR_WARNING), - array(Logger::ERROR, SlackRecord::COLOR_DANGER), - array(Logger::CRITICAL, SlackRecord::COLOR_DANGER), - array(Logger::ALERT, SlackRecord::COLOR_DANGER), - array(Logger::EMERGENCY, SlackRecord::COLOR_DANGER), - ); - } - - /** - * @dataProvider dataGetAttachmentColor - * @param int $logLevel - * @param string $expectedColour RGB hex color or name of Slack color - * @covers ::getAttachmentColor - */ - public function testGetAttachmentColor($logLevel, $expectedColour) - { - $slackRecord = new SlackRecord(); - $this->assertSame( - $expectedColour, - $slackRecord->getAttachmentColor($logLevel) - ); - } - - public function testAddsChannel() - { - $channel = '#test'; - $record = new SlackRecord($channel); - $data = $record->getSlackData($this->getRecord()); - - $this->assertArrayHasKey('channel', $data); - $this->assertSame($channel, $data['channel']); - } - - public function testNoUsernameByDefault() - { - $record = new SlackRecord(); - $data = $record->getSlackData($this->getRecord()); - - $this->assertArrayNotHasKey('username', $data); - } - - /** - * @return array - */ - public function dataStringify() - { - $jsonPrettyPrintFlag = defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 128; - - $multipleDimensions = array(array(1, 2)); - $numericKeys = array('library' => 'monolog'); - $singleDimension = array(1, 'Hello', 'Jordi'); - - return array( - array(array(), '[]'), - array($multipleDimensions, json_encode($multipleDimensions, $jsonPrettyPrintFlag)), - array($numericKeys, json_encode($numericKeys, $jsonPrettyPrintFlag)), - array($singleDimension, json_encode($singleDimension)) - ); - } - - /** - * @dataProvider dataStringify - */ - public function testStringify($fields, $expectedResult) - { - $slackRecord = new SlackRecord( - '#test', - 'test', - true, - null, - true, - true - ); - - $this->assertSame($expectedResult, $slackRecord->stringify($fields)); - } - - public function testAddsCustomUsername() - { - $username = 'Monolog bot'; - $record = new SlackRecord(null, $username); - $data = $record->getSlackData($this->getRecord()); - - $this->assertArrayHasKey('username', $data); - $this->assertSame($username, $data['username']); - } - - public function testNoIcon() - { - $record = new SlackRecord(); - $data = $record->getSlackData($this->getRecord()); - - $this->assertArrayNotHasKey('icon_emoji', $data); - } - - public function testAddsIcon() - { - $record = $this->getRecord(); - $slackRecord = new SlackRecord(null, null, false, 'ghost'); - $data = $slackRecord->getSlackData($record); - - $slackRecord2 = new SlackRecord(null, null, false, 'http://github.com/Seldaek/monolog'); - $data2 = $slackRecord2->getSlackData($record); - - $this->assertArrayHasKey('icon_emoji', $data); - $this->assertSame(':ghost:', $data['icon_emoji']); - $this->assertArrayHasKey('icon_url', $data2); - $this->assertSame('http://github.com/Seldaek/monolog', $data2['icon_url']); - } - - public function testAttachmentsNotPresentIfNoAttachment() - { - $record = new SlackRecord(null, null, false); - $data = $record->getSlackData($this->getRecord()); - - $this->assertArrayNotHasKey('attachments', $data); - } - - public function testAddsOneAttachment() - { - $record = new SlackRecord(); - $data = $record->getSlackData($this->getRecord()); - - $this->assertArrayHasKey('attachments', $data); - $this->assertArrayHasKey(0, $data['attachments']); - $this->assertInternalType('array', $data['attachments'][0]); - } - - public function testTextEqualsMessageIfNoAttachment() - { - $message = 'Test message'; - $record = new SlackRecord(null, null, false); - $data = $record->getSlackData($this->getRecord(Logger::WARNING, $message)); - - $this->assertArrayHasKey('text', $data); - $this->assertSame($message, $data['text']); - } - - public function testTextEqualsFormatterOutput() - { - $formatter = $this->getMock('Monolog\\Formatter\\FormatterInterface'); - $formatter - ->expects($this->any()) - ->method('format') - ->will($this->returnCallback(function ($record) { return $record['message'] . 'test'; })); - - $formatter2 = $this->getMock('Monolog\\Formatter\\FormatterInterface'); - $formatter2 - ->expects($this->any()) - ->method('format') - ->will($this->returnCallback(function ($record) { return $record['message'] . 'test1'; })); - - $message = 'Test message'; - $record = new SlackRecord(null, null, false, null, false, false, array(), $formatter); - $data = $record->getSlackData($this->getRecord(Logger::WARNING, $message)); - - $this->assertArrayHasKey('text', $data); - $this->assertSame($message . 'test', $data['text']); - - $record->setFormatter($formatter2); - $data = $record->getSlackData($this->getRecord(Logger::WARNING, $message)); - - $this->assertArrayHasKey('text', $data); - $this->assertSame($message . 'test1', $data['text']); - } - - public function testAddsFallbackAndTextToAttachment() - { - $message = 'Test message'; - $record = new SlackRecord(null); - $data = $record->getSlackData($this->getRecord(Logger::WARNING, $message)); - - $this->assertSame($message, $data['attachments'][0]['text']); - $this->assertSame($message, $data['attachments'][0]['fallback']); - } - - public function testMapsLevelToColorAttachmentColor() - { - $record = new SlackRecord(null); - $errorLoggerRecord = $this->getRecord(Logger::ERROR); - $emergencyLoggerRecord = $this->getRecord(Logger::EMERGENCY); - $warningLoggerRecord = $this->getRecord(Logger::WARNING); - $infoLoggerRecord = $this->getRecord(Logger::INFO); - $debugLoggerRecord = $this->getRecord(Logger::DEBUG); - - $data = $record->getSlackData($errorLoggerRecord); - $this->assertSame(SlackRecord::COLOR_DANGER, $data['attachments'][0]['color']); - - $data = $record->getSlackData($emergencyLoggerRecord); - $this->assertSame(SlackRecord::COLOR_DANGER, $data['attachments'][0]['color']); - - $data = $record->getSlackData($warningLoggerRecord); - $this->assertSame(SlackRecord::COLOR_WARNING, $data['attachments'][0]['color']); - - $data = $record->getSlackData($infoLoggerRecord); - $this->assertSame(SlackRecord::COLOR_GOOD, $data['attachments'][0]['color']); - - $data = $record->getSlackData($debugLoggerRecord); - $this->assertSame(SlackRecord::COLOR_DEFAULT, $data['attachments'][0]['color']); - } - - public function testAddsShortAttachmentWithoutContextAndExtra() - { - $level = Logger::ERROR; - $levelName = Logger::getLevelName($level); - $record = new SlackRecord(null, null, true, null, true); - $data = $record->getSlackData($this->getRecord($level, 'test', array('test' => 1))); - - $attachment = $data['attachments'][0]; - $this->assertArrayHasKey('title', $attachment); - $this->assertArrayHasKey('fields', $attachment); - $this->assertSame($levelName, $attachment['title']); - $this->assertSame(array(), $attachment['fields']); - } - - public function testAddsShortAttachmentWithContextAndExtra() - { - $level = Logger::ERROR; - $levelName = Logger::getLevelName($level); - $context = array('test' => 1); - $extra = array('tags' => array('web')); - $record = new SlackRecord(null, null, true, null, true, true); - $loggerRecord = $this->getRecord($level, 'test', $context); - $loggerRecord['extra'] = $extra; - $data = $record->getSlackData($loggerRecord); - - $attachment = $data['attachments'][0]; - $this->assertArrayHasKey('title', $attachment); - $this->assertArrayHasKey('fields', $attachment); - $this->assertCount(2, $attachment['fields']); - $this->assertSame($levelName, $attachment['title']); - $this->assertSame( - array( - array( - 'title' => 'Extra', - 'value' => sprintf('```%s```', json_encode($extra, $this->jsonPrettyPrintFlag)), - 'short' => false - ), - array( - 'title' => 'Context', - 'value' => sprintf('```%s```', json_encode($context, $this->jsonPrettyPrintFlag)), - 'short' => false - ) - ), - $attachment['fields'] - ); - } - - public function testAddsLongAttachmentWithoutContextAndExtra() - { - $level = Logger::ERROR; - $levelName = Logger::getLevelName($level); - $record = new SlackRecord(null, null, true, null); - $data = $record->getSlackData($this->getRecord($level, 'test', array('test' => 1))); - - $attachment = $data['attachments'][0]; - $this->assertArrayHasKey('title', $attachment); - $this->assertArrayHasKey('fields', $attachment); - $this->assertCount(1, $attachment['fields']); - $this->assertSame('Message', $attachment['title']); - $this->assertSame( - array(array( - 'title' => 'Level', - 'value' => $levelName, - 'short' => false - )), - $attachment['fields'] - ); - } - - public function testAddsLongAttachmentWithContextAndExtra() - { - $level = Logger::ERROR; - $levelName = Logger::getLevelName($level); - $context = array('test' => 1); - $extra = array('tags' => array('web')); - $record = new SlackRecord(null, null, true, null, false, true); - $loggerRecord = $this->getRecord($level, 'test', $context); - $loggerRecord['extra'] = $extra; - $data = $record->getSlackData($loggerRecord); - - $expectedFields = array( - array( - 'title' => 'Level', - 'value' => $levelName, - 'short' => false, - ), - array( - 'title' => 'Tags', - 'value' => sprintf('```%s```', json_encode($extra['tags'])), - 'short' => false - ), - array( - 'title' => 'Test', - 'value' => $context['test'], - 'short' => false - ) - ); - - $attachment = $data['attachments'][0]; - $this->assertArrayHasKey('title', $attachment); - $this->assertArrayHasKey('fields', $attachment); - $this->assertCount(3, $attachment['fields']); - $this->assertSame('Message', $attachment['title']); - $this->assertSame( - $expectedFields, - $attachment['fields'] - ); - } - - public function testAddsTimestampToAttachment() - { - $record = $this->getRecord(); - $slackRecord = new SlackRecord(); - $data = $slackRecord->getSlackData($this->getRecord()); - - $attachment = $data['attachments'][0]; - $this->assertArrayHasKey('ts', $attachment); - $this->assertSame($record['datetime']->getTimestamp(), $attachment['ts']); - } - - public function testContextHasException() - { - $record = $this->getRecord(Logger::CRITICAL, 'This is a critical message.', array('exception' => new \Exception())); - $slackRecord = new SlackRecord(null, null, true, null, false, true); - $data = $slackRecord->getSlackData($record); - $this->assertInternalType('string', $data['attachments'][0]['fields'][1]['value']); - } - - public function testExcludeExtraAndContextFields() - { - $record = $this->getRecord( - Logger::WARNING, - 'test', - array('info' => array('library' => 'monolog', 'author' => 'Jordi')) - ); - $record['extra'] = array('tags' => array('web', 'cli')); - - $slackRecord = new SlackRecord(null, null, true, null, false, true, array('context.info.library', 'extra.tags.1')); - $data = $slackRecord->getSlackData($record); - $attachment = $data['attachments'][0]; - - $expected = array( - array( - 'title' => 'Info', - 'value' => sprintf('```%s```', json_encode(array('author' => 'Jordi'), $this->jsonPrettyPrintFlag)), - 'short' => false - ), - array( - 'title' => 'Tags', - 'value' => sprintf('```%s```', json_encode(array('web'))), - 'short' => false - ), - ); - - foreach ($expected as $field) { - $this->assertNotFalse(array_search($field, $attachment['fields'])); - break; - } - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/SlackHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/SlackHandlerTest.php deleted file mode 100644 index b12b01f..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/SlackHandlerTest.php +++ /dev/null @@ -1,155 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; -use Monolog\Logger; -use Monolog\Formatter\LineFormatter; -use Monolog\Handler\Slack\SlackRecord; - -/** - * @author Greg Kedzierski - * @see https://api.slack.com/ - */ -class SlackHandlerTest extends TestCase -{ - /** - * @var resource - */ - private $res; - - /** - * @var SlackHandler - */ - private $handler; - - public function setUp() - { - if (!extension_loaded('openssl')) { - $this->markTestSkipped('This test requires openssl to run'); - } - } - - public function testWriteHeader() - { - $this->createHandler(); - $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1')); - fseek($this->res, 0); - $content = fread($this->res, 1024); - - $this->assertRegexp('/POST \/api\/chat.postMessage HTTP\/1.1\\r\\nHost: slack.com\\r\\nContent-Type: application\/x-www-form-urlencoded\\r\\nContent-Length: \d{2,4}\\r\\n\\r\\n/', $content); - } - - public function testWriteContent() - { - $this->createHandler(); - $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1')); - fseek($this->res, 0); - $content = fread($this->res, 1024); - - $this->assertRegExp('/username=Monolog/', $content); - $this->assertRegExp('/channel=channel1/', $content); - $this->assertRegExp('/token=myToken/', $content); - $this->assertRegExp('/attachments/', $content); - } - - public function testWriteContentUsesFormatterIfProvided() - { - $this->createHandler('myToken', 'channel1', 'Monolog', false); - $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1')); - fseek($this->res, 0); - $content = fread($this->res, 1024); - - $this->createHandler('myToken', 'channel1', 'Monolog', false); - $this->handler->setFormatter(new LineFormatter('foo--%message%')); - $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test2')); - fseek($this->res, 0); - $content2 = fread($this->res, 1024); - - $this->assertRegexp('/text=test1/', $content); - $this->assertRegexp('/text=foo--test2/', $content2); - } - - public function testWriteContentWithEmoji() - { - $this->createHandler('myToken', 'channel1', 'Monolog', true, 'alien'); - $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1')); - fseek($this->res, 0); - $content = fread($this->res, 1024); - - $this->assertRegexp('/icon_emoji=%3Aalien%3A/', $content); - } - - /** - * @dataProvider provideLevelColors - */ - public function testWriteContentWithColors($level, $expectedColor) - { - $this->createHandler(); - $this->handler->handle($this->getRecord($level, 'test1')); - fseek($this->res, 0); - $content = fread($this->res, 1024); - - $this->assertRegexp('/%22color%22%3A%22'.$expectedColor.'/', $content); - } - - public function testWriteContentWithPlainTextMessage() - { - $this->createHandler('myToken', 'channel1', 'Monolog', false); - $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1')); - fseek($this->res, 0); - $content = fread($this->res, 1024); - - $this->assertRegexp('/text=test1/', $content); - } - - public function provideLevelColors() - { - return array( - array(Logger::DEBUG, urlencode(SlackRecord::COLOR_DEFAULT)), - array(Logger::INFO, SlackRecord::COLOR_GOOD), - array(Logger::NOTICE, SlackRecord::COLOR_GOOD), - array(Logger::WARNING, SlackRecord::COLOR_WARNING), - array(Logger::ERROR, SlackRecord::COLOR_DANGER), - array(Logger::CRITICAL, SlackRecord::COLOR_DANGER), - array(Logger::ALERT, SlackRecord::COLOR_DANGER), - array(Logger::EMERGENCY,SlackRecord::COLOR_DANGER), - ); - } - - private function createHandler($token = 'myToken', $channel = 'channel1', $username = 'Monolog', $useAttachment = true, $iconEmoji = null, $useShortAttachment = false, $includeExtra = false) - { - $constructorArgs = array($token, $channel, $username, $useAttachment, $iconEmoji, Logger::DEBUG, true, $useShortAttachment, $includeExtra); - $this->res = fopen('php://memory', 'a'); - $this->handler = $this->getMock( - '\Monolog\Handler\SlackHandler', - array('fsockopen', 'streamSetTimeout', 'closeSocket'), - $constructorArgs - ); - - $reflectionProperty = new \ReflectionProperty('\Monolog\Handler\SocketHandler', 'connectionString'); - $reflectionProperty->setAccessible(true); - $reflectionProperty->setValue($this->handler, 'localhost:1234'); - - $this->handler->expects($this->any()) - ->method('fsockopen') - ->will($this->returnValue($this->res)); - $this->handler->expects($this->any()) - ->method('streamSetTimeout') - ->will($this->returnValue(true)); - $this->handler->expects($this->any()) - ->method('closeSocket') - ->will($this->returnValue(true)); - - $this->handler->setFormatter($this->getIdentityFormatter()); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/SlackWebhookHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/SlackWebhookHandlerTest.php deleted file mode 100644 index c9229e2..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/SlackWebhookHandlerTest.php +++ /dev/null @@ -1,107 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; -use Monolog\Logger; -use Monolog\Formatter\LineFormatter; -use Monolog\Handler\Slack\SlackRecord; - -/** - * @author Haralan Dobrev - * @see https://api.slack.com/incoming-webhooks - * @coversDefaultClass Monolog\Handler\SlackWebhookHandler - */ -class SlackWebhookHandlerTest extends TestCase -{ - const WEBHOOK_URL = 'https://hooks.slack.com/services/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E'; - - /** - * @covers ::__construct - * @covers ::getSlackRecord - */ - public function testConstructorMinimal() - { - $handler = new SlackWebhookHandler(self::WEBHOOK_URL); - $record = $this->getRecord(); - $slackRecord = $handler->getSlackRecord(); - $this->assertInstanceOf('Monolog\Handler\Slack\SlackRecord', $slackRecord); - $this->assertEquals(array( - 'attachments' => array( - array( - 'fallback' => 'test', - 'text' => 'test', - 'color' => SlackRecord::COLOR_WARNING, - 'fields' => array( - array( - 'title' => 'Level', - 'value' => 'WARNING', - 'short' => false, - ), - ), - 'title' => 'Message', - 'mrkdwn_in' => array('fields'), - 'ts' => $record['datetime']->getTimestamp(), - ), - ), - ), $slackRecord->getSlackData($record)); - } - - /** - * @covers ::__construct - * @covers ::getSlackRecord - */ - public function testConstructorFull() - { - $handler = new SlackWebhookHandler( - self::WEBHOOK_URL, - 'test-channel', - 'test-username', - false, - ':ghost:', - false, - false, - Logger::DEBUG, - false - ); - - $slackRecord = $handler->getSlackRecord(); - $this->assertInstanceOf('Monolog\Handler\Slack\SlackRecord', $slackRecord); - $this->assertEquals(array( - 'username' => 'test-username', - 'text' => 'test', - 'channel' => 'test-channel', - 'icon_emoji' => ':ghost:', - ), $slackRecord->getSlackData($this->getRecord())); - } - - /** - * @covers ::getFormatter - */ - public function testGetFormatter() - { - $handler = new SlackWebhookHandler(self::WEBHOOK_URL); - $formatter = $handler->getFormatter(); - $this->assertInstanceOf('Monolog\Formatter\FormatterInterface', $formatter); - } - - /** - * @covers ::setFormatter - */ - public function testSetFormatter() - { - $handler = new SlackWebhookHandler(self::WEBHOOK_URL); - $formatter = new LineFormatter(); - $handler->setFormatter($formatter); - $this->assertSame($formatter, $handler->getFormatter()); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/SlackbotHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/SlackbotHandlerTest.php deleted file mode 100644 index b1b02bd..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/SlackbotHandlerTest.php +++ /dev/null @@ -1,47 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; -use Monolog\Logger; - -/** - * @author Haralan Dobrev - * @see https://slack.com/apps/A0F81R8ET-slackbot - * @coversDefaultClass Monolog\Handler\SlackbotHandler - */ -class SlackbotHandlerTest extends TestCase -{ - /** - * @covers ::__construct - */ - public function testConstructorMinimal() - { - $handler = new SlackbotHandler('test-team', 'test-token', 'test-channel'); - $this->assertInstanceOf('Monolog\Handler\AbstractProcessingHandler', $handler); - } - - /** - * @covers ::__construct - */ - public function testConstructorFull() - { - $handler = new SlackbotHandler( - 'test-team', - 'test-token', - 'test-channel', - Logger::DEBUG, - false - ); - $this->assertInstanceOf('Monolog\Handler\AbstractProcessingHandler', $handler); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/SocketHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/SocketHandlerTest.php deleted file mode 100644 index 1da987c..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/SocketHandlerTest.php +++ /dev/null @@ -1,335 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; -use Monolog\Logger; - -/** - * @author Pablo de Leon Belloc - */ -class SocketHandlerTest extends TestCase -{ - /** - * @var Monolog\Handler\SocketHandler - */ - private $handler; - - /** - * @var resource - */ - private $res; - - /** - * @expectedException UnexpectedValueException - */ - public function testInvalidHostname() - { - $this->createHandler('garbage://here'); - $this->writeRecord('data'); - } - - /** - * @expectedException \InvalidArgumentException - */ - public function testBadConnectionTimeout() - { - $this->createHandler('localhost:1234'); - $this->handler->setConnectionTimeout(-1); - } - - public function testSetConnectionTimeout() - { - $this->createHandler('localhost:1234'); - $this->handler->setConnectionTimeout(10.1); - $this->assertEquals(10.1, $this->handler->getConnectionTimeout()); - } - - /** - * @expectedException \InvalidArgumentException - */ - public function testBadTimeout() - { - $this->createHandler('localhost:1234'); - $this->handler->setTimeout(-1); - } - - public function testSetTimeout() - { - $this->createHandler('localhost:1234'); - $this->handler->setTimeout(10.25); - $this->assertEquals(10.25, $this->handler->getTimeout()); - } - - public function testSetWritingTimeout() - { - $this->createHandler('localhost:1234'); - $this->handler->setWritingTimeout(10.25); - $this->assertEquals(10.25, $this->handler->getWritingTimeout()); - } - - public function testSetChunkSize() - { - $this->createHandler('localhost:1234'); - $this->handler->setChunkSize(1025); - $this->assertEquals(1025, $this->handler->getChunkSize()); - } - - public function testSetConnectionString() - { - $this->createHandler('tcp://localhost:9090'); - $this->assertEquals('tcp://localhost:9090', $this->handler->getConnectionString()); - } - - /** - * @expectedException UnexpectedValueException - */ - public function testExceptionIsThrownOnFsockopenError() - { - $this->setMockHandler(array('fsockopen')); - $this->handler->expects($this->once()) - ->method('fsockopen') - ->will($this->returnValue(false)); - $this->writeRecord('Hello world'); - } - - /** - * @expectedException UnexpectedValueException - */ - public function testExceptionIsThrownOnPfsockopenError() - { - $this->setMockHandler(array('pfsockopen')); - $this->handler->expects($this->once()) - ->method('pfsockopen') - ->will($this->returnValue(false)); - $this->handler->setPersistent(true); - $this->writeRecord('Hello world'); - } - - /** - * @expectedException UnexpectedValueException - */ - public function testExceptionIsThrownIfCannotSetTimeout() - { - $this->setMockHandler(array('streamSetTimeout')); - $this->handler->expects($this->once()) - ->method('streamSetTimeout') - ->will($this->returnValue(false)); - $this->writeRecord('Hello world'); - } - - /** - * @expectedException UnexpectedValueException - */ - public function testExceptionIsThrownIfCannotSetChunkSize() - { - $this->setMockHandler(array('streamSetChunkSize')); - $this->handler->setChunkSize(8192); - $this->handler->expects($this->once()) - ->method('streamSetChunkSize') - ->will($this->returnValue(false)); - $this->writeRecord('Hello world'); - } - - /** - * @expectedException RuntimeException - */ - public function testWriteFailsOnIfFwriteReturnsFalse() - { - $this->setMockHandler(array('fwrite')); - - $callback = function ($arg) { - $map = array( - 'Hello world' => 6, - 'world' => false, - ); - - return $map[$arg]; - }; - - $this->handler->expects($this->exactly(2)) - ->method('fwrite') - ->will($this->returnCallback($callback)); - - $this->writeRecord('Hello world'); - } - - /** - * @expectedException RuntimeException - */ - public function testWriteFailsIfStreamTimesOut() - { - $this->setMockHandler(array('fwrite', 'streamGetMetadata')); - - $callback = function ($arg) { - $map = array( - 'Hello world' => 6, - 'world' => 5, - ); - - return $map[$arg]; - }; - - $this->handler->expects($this->exactly(1)) - ->method('fwrite') - ->will($this->returnCallback($callback)); - $this->handler->expects($this->exactly(1)) - ->method('streamGetMetadata') - ->will($this->returnValue(array('timed_out' => true))); - - $this->writeRecord('Hello world'); - } - - /** - * @expectedException RuntimeException - */ - public function testWriteFailsOnIncompleteWrite() - { - $this->setMockHandler(array('fwrite', 'streamGetMetadata')); - - $res = $this->res; - $callback = function ($string) use ($res) { - fclose($res); - - return strlen('Hello'); - }; - - $this->handler->expects($this->exactly(1)) - ->method('fwrite') - ->will($this->returnCallback($callback)); - $this->handler->expects($this->exactly(1)) - ->method('streamGetMetadata') - ->will($this->returnValue(array('timed_out' => false))); - - $this->writeRecord('Hello world'); - } - - public function testWriteWithMemoryFile() - { - $this->setMockHandler(); - $this->writeRecord('test1'); - $this->writeRecord('test2'); - $this->writeRecord('test3'); - fseek($this->res, 0); - $this->assertEquals('test1test2test3', fread($this->res, 1024)); - } - - public function testWriteWithMock() - { - $this->setMockHandler(array('fwrite')); - - $callback = function ($arg) { - $map = array( - 'Hello world' => 6, - 'world' => 5, - ); - - return $map[$arg]; - }; - - $this->handler->expects($this->exactly(2)) - ->method('fwrite') - ->will($this->returnCallback($callback)); - - $this->writeRecord('Hello world'); - } - - public function testClose() - { - $this->setMockHandler(); - $this->writeRecord('Hello world'); - $this->assertInternalType('resource', $this->res); - $this->handler->close(); - $this->assertFalse(is_resource($this->res), "Expected resource to be closed after closing handler"); - } - - public function testCloseDoesNotClosePersistentSocket() - { - $this->setMockHandler(); - $this->handler->setPersistent(true); - $this->writeRecord('Hello world'); - $this->assertTrue(is_resource($this->res)); - $this->handler->close(); - $this->assertTrue(is_resource($this->res)); - } - - /** - * @expectedException \RuntimeException - */ - public function testAvoidInfiniteLoopWhenNoDataIsWrittenForAWritingTimeoutSeconds() - { - $this->setMockHandler(array('fwrite', 'streamGetMetadata')); - - $this->handler->expects($this->any()) - ->method('fwrite') - ->will($this->returnValue(0)); - - $this->handler->expects($this->any()) - ->method('streamGetMetadata') - ->will($this->returnValue(array('timed_out' => false))); - - $this->handler->setWritingTimeout(1); - - $this->writeRecord('Hello world'); - } - - private function createHandler($connectionString) - { - $this->handler = new SocketHandler($connectionString); - $this->handler->setFormatter($this->getIdentityFormatter()); - } - - private function writeRecord($string) - { - $this->handler->handle($this->getRecord(Logger::WARNING, $string)); - } - - private function setMockHandler(array $methods = array()) - { - $this->res = fopen('php://memory', 'a'); - - $defaultMethods = array('fsockopen', 'pfsockopen', 'streamSetTimeout'); - $newMethods = array_diff($methods, $defaultMethods); - - $finalMethods = array_merge($defaultMethods, $newMethods); - - $this->handler = $this->getMock( - '\Monolog\Handler\SocketHandler', $finalMethods, array('localhost:1234') - ); - - if (!in_array('fsockopen', $methods)) { - $this->handler->expects($this->any()) - ->method('fsockopen') - ->will($this->returnValue($this->res)); - } - - if (!in_array('pfsockopen', $methods)) { - $this->handler->expects($this->any()) - ->method('pfsockopen') - ->will($this->returnValue($this->res)); - } - - if (!in_array('streamSetTimeout', $methods)) { - $this->handler->expects($this->any()) - ->method('streamSetTimeout') - ->will($this->returnValue(true)); - } - - if (!in_array('streamSetChunkSize', $methods)) { - $this->handler->expects($this->any()) - ->method('streamSetChunkSize') - ->will($this->returnValue(8192)); - } - - $this->handler->setFormatter($this->getIdentityFormatter()); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/StreamHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/StreamHandlerTest.php deleted file mode 100644 index 487030f..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/StreamHandlerTest.php +++ /dev/null @@ -1,184 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; -use Monolog\Logger; - -class StreamHandlerTest extends TestCase -{ - /** - * @covers Monolog\Handler\StreamHandler::__construct - * @covers Monolog\Handler\StreamHandler::write - */ - public function testWrite() - { - $handle = fopen('php://memory', 'a+'); - $handler = new StreamHandler($handle); - $handler->setFormatter($this->getIdentityFormatter()); - $handler->handle($this->getRecord(Logger::WARNING, 'test')); - $handler->handle($this->getRecord(Logger::WARNING, 'test2')); - $handler->handle($this->getRecord(Logger::WARNING, 'test3')); - fseek($handle, 0); - $this->assertEquals('testtest2test3', fread($handle, 100)); - } - - /** - * @covers Monolog\Handler\StreamHandler::close - */ - public function testCloseKeepsExternalHandlersOpen() - { - $handle = fopen('php://memory', 'a+'); - $handler = new StreamHandler($handle); - $this->assertTrue(is_resource($handle)); - $handler->close(); - $this->assertTrue(is_resource($handle)); - } - - /** - * @covers Monolog\Handler\StreamHandler::close - */ - public function testClose() - { - $handler = new StreamHandler('php://memory'); - $handler->handle($this->getRecord(Logger::WARNING, 'test')); - $streamProp = new \ReflectionProperty('Monolog\Handler\StreamHandler', 'stream'); - $streamProp->setAccessible(true); - $handle = $streamProp->getValue($handler); - - $this->assertTrue(is_resource($handle)); - $handler->close(); - $this->assertFalse(is_resource($handle)); - } - - /** - * @covers Monolog\Handler\StreamHandler::write - */ - public function testWriteCreatesTheStreamResource() - { - $handler = new StreamHandler('php://memory'); - $handler->handle($this->getRecord()); - } - - /** - * @covers Monolog\Handler\StreamHandler::__construct - * @covers Monolog\Handler\StreamHandler::write - */ - public function testWriteLocking() - { - $temp = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'monolog_locked_log'; - $handler = new StreamHandler($temp, Logger::DEBUG, true, null, true); - $handler->handle($this->getRecord()); - } - - /** - * @expectedException LogicException - * @covers Monolog\Handler\StreamHandler::__construct - * @covers Monolog\Handler\StreamHandler::write - */ - public function testWriteMissingResource() - { - $handler = new StreamHandler(null); - $handler->handle($this->getRecord()); - } - - public function invalidArgumentProvider() - { - return array( - array(1), - array(array()), - array(array('bogus://url')), - ); - } - - /** - * @dataProvider invalidArgumentProvider - * @expectedException InvalidArgumentException - * @covers Monolog\Handler\StreamHandler::__construct - */ - public function testWriteInvalidArgument($invalidArgument) - { - $handler = new StreamHandler($invalidArgument); - } - - /** - * @expectedException UnexpectedValueException - * @covers Monolog\Handler\StreamHandler::__construct - * @covers Monolog\Handler\StreamHandler::write - */ - public function testWriteInvalidResource() - { - $handler = new StreamHandler('bogus://url'); - $handler->handle($this->getRecord()); - } - - /** - * @expectedException UnexpectedValueException - * @covers Monolog\Handler\StreamHandler::__construct - * @covers Monolog\Handler\StreamHandler::write - */ - public function testWriteNonExistingResource() - { - $handler = new StreamHandler('ftp://foo/bar/baz/'.rand(0, 10000)); - $handler->handle($this->getRecord()); - } - - /** - * @covers Monolog\Handler\StreamHandler::__construct - * @covers Monolog\Handler\StreamHandler::write - */ - public function testWriteNonExistingPath() - { - $handler = new StreamHandler(sys_get_temp_dir().'/bar/'.rand(0, 10000).DIRECTORY_SEPARATOR.rand(0, 10000)); - $handler->handle($this->getRecord()); - } - - /** - * @covers Monolog\Handler\StreamHandler::__construct - * @covers Monolog\Handler\StreamHandler::write - */ - public function testWriteNonExistingFileResource() - { - $handler = new StreamHandler('file://'.sys_get_temp_dir().'/bar/'.rand(0, 10000).DIRECTORY_SEPARATOR.rand(0, 10000)); - $handler->handle($this->getRecord()); - } - - /** - * @expectedException Exception - * @expectedExceptionMessageRegExp /There is no existing directory at/ - * @covers Monolog\Handler\StreamHandler::__construct - * @covers Monolog\Handler\StreamHandler::write - */ - public function testWriteNonExistingAndNotCreatablePath() - { - if (defined('PHP_WINDOWS_VERSION_BUILD')) { - $this->markTestSkipped('Permissions checks can not run on windows'); - } - $handler = new StreamHandler('/foo/bar/'.rand(0, 10000).DIRECTORY_SEPARATOR.rand(0, 10000)); - $handler->handle($this->getRecord()); - } - - /** - * @expectedException Exception - * @expectedExceptionMessageRegExp /There is no existing directory at/ - * @covers Monolog\Handler\StreamHandler::__construct - * @covers Monolog\Handler\StreamHandler::write - */ - public function testWriteNonExistingAndNotCreatableFileResource() - { - if (defined('PHP_WINDOWS_VERSION_BUILD')) { - $this->markTestSkipped('Permissions checks can not run on windows'); - } - $handler = new StreamHandler('file:///foo/bar/'.rand(0, 10000).DIRECTORY_SEPARATOR.rand(0, 10000)); - $handler->handle($this->getRecord()); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/SwiftMailerHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/SwiftMailerHandlerTest.php deleted file mode 100644 index 1d62940..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/SwiftMailerHandlerTest.php +++ /dev/null @@ -1,113 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\Logger; -use Monolog\TestCase; - -class SwiftMailerHandlerTest extends TestCase -{ - /** @var \Swift_Mailer|\PHPUnit_Framework_MockObject_MockObject */ - private $mailer; - - public function setUp() - { - $this->mailer = $this - ->getMockBuilder('Swift_Mailer') - ->disableOriginalConstructor() - ->getMock(); - } - - public function testMessageCreationIsLazyWhenUsingCallback() - { - $this->mailer->expects($this->never()) - ->method('send'); - - $callback = function () { - throw new \RuntimeException('Swift_Message creation callback should not have been called in this test'); - }; - $handler = new SwiftMailerHandler($this->mailer, $callback); - - $records = array( - $this->getRecord(Logger::DEBUG), - $this->getRecord(Logger::INFO), - ); - $handler->handleBatch($records); - } - - public function testMessageCanBeCustomizedGivenLoggedData() - { - // Wire Mailer to expect a specific Swift_Message with a customized Subject - $expectedMessage = new \Swift_Message(); - $this->mailer->expects($this->once()) - ->method('send') - ->with($this->callback(function ($value) use ($expectedMessage) { - return $value instanceof \Swift_Message - && $value->getSubject() === 'Emergency' - && $value === $expectedMessage; - })); - - // Callback dynamically changes subject based on number of logged records - $callback = function ($content, array $records) use ($expectedMessage) { - $subject = count($records) > 0 ? 'Emergency' : 'Normal'; - $expectedMessage->setSubject($subject); - - return $expectedMessage; - }; - $handler = new SwiftMailerHandler($this->mailer, $callback); - - // Logging 1 record makes this an Emergency - $records = array( - $this->getRecord(Logger::EMERGENCY), - ); - $handler->handleBatch($records); - } - - public function testMessageSubjectFormatting() - { - // Wire Mailer to expect a specific Swift_Message with a customized Subject - $messageTemplate = new \Swift_Message(); - $messageTemplate->setSubject('Alert: %level_name% %message%'); - $receivedMessage = null; - - $this->mailer->expects($this->once()) - ->method('send') - ->with($this->callback(function ($value) use (&$receivedMessage) { - $receivedMessage = $value; - return true; - })); - - $handler = new SwiftMailerHandler($this->mailer, $messageTemplate); - - $records = array( - $this->getRecord(Logger::EMERGENCY), - ); - $handler->handleBatch($records); - - $this->assertEquals('Alert: EMERGENCY test', $receivedMessage->getSubject()); - } - - public function testMessageHaveUniqueId() - { - $messageTemplate = new \Swift_Message(); - $handler = new SwiftMailerHandler($this->mailer, $messageTemplate); - - $method = new \ReflectionMethod('Monolog\Handler\SwiftMailerHandler', 'buildMessage'); - $method->setAccessible(true); - $method->invokeArgs($handler, array($messageTemplate, array())); - - $builtMessage1 = $method->invoke($handler, $messageTemplate, array()); - $builtMessage2 = $method->invoke($handler, $messageTemplate, array()); - - $this->assertFalse($builtMessage1->getId() === $builtMessage2->getId(), 'Two different messages have the same id'); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/SyslogHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/SyslogHandlerTest.php deleted file mode 100644 index 8f9e46b..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/SyslogHandlerTest.php +++ /dev/null @@ -1,44 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\Logger; - -class SyslogHandlerTest extends \PHPUnit_Framework_TestCase -{ - /** - * @covers Monolog\Handler\SyslogHandler::__construct - */ - public function testConstruct() - { - $handler = new SyslogHandler('test'); - $this->assertInstanceOf('Monolog\Handler\SyslogHandler', $handler); - - $handler = new SyslogHandler('test', LOG_USER); - $this->assertInstanceOf('Monolog\Handler\SyslogHandler', $handler); - - $handler = new SyslogHandler('test', 'user'); - $this->assertInstanceOf('Monolog\Handler\SyslogHandler', $handler); - - $handler = new SyslogHandler('test', LOG_USER, Logger::DEBUG, true, LOG_PERROR); - $this->assertInstanceOf('Monolog\Handler\SyslogHandler', $handler); - } - - /** - * @covers Monolog\Handler\SyslogHandler::__construct - */ - public function testConstructInvalidFacility() - { - $this->setExpectedException('UnexpectedValueException'); - $handler = new SyslogHandler('test', 'unknown'); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/SyslogUdpHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/SyslogUdpHandlerTest.php deleted file mode 100644 index 7ee8a98..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/SyslogUdpHandlerTest.php +++ /dev/null @@ -1,76 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; - -/** - * @requires extension sockets - */ -class SyslogUdpHandlerTest extends TestCase -{ - /** - * @expectedException UnexpectedValueException - */ - public function testWeValidateFacilities() - { - $handler = new SyslogUdpHandler("ip", null, "invalidFacility"); - } - - public function testWeSplitIntoLines() - { - $time = '2014-01-07T12:34'; - $pid = getmypid(); - $host = gethostname(); - - $handler = $this->getMockBuilder('\Monolog\Handler\SyslogUdpHandler') - ->setConstructorArgs(array("127.0.0.1", 514, "authpriv")) - ->setMethods(array('getDateTime')) - ->getMock(); - - $handler->method('getDateTime') - ->willReturn($time); - - $handler->setFormatter(new \Monolog\Formatter\ChromePHPFormatter()); - - $socket = $this->getMock('\Monolog\Handler\SyslogUdp\UdpSocket', array('write'), array('lol', 'lol')); - $socket->expects($this->at(0)) - ->method('write') - ->with("lol", "<".(LOG_AUTHPRIV + LOG_WARNING).">1 $time $host php $pid - - "); - $socket->expects($this->at(1)) - ->method('write') - ->with("hej", "<".(LOG_AUTHPRIV + LOG_WARNING).">1 $time $host php $pid - - "); - - $handler->setSocket($socket); - - $handler->handle($this->getRecordWithMessage("hej\nlol")); - } - - public function testSplitWorksOnEmptyMsg() - { - $handler = new SyslogUdpHandler("127.0.0.1", 514, "authpriv"); - $handler->setFormatter($this->getIdentityFormatter()); - - $socket = $this->getMock('\Monolog\Handler\SyslogUdp\UdpSocket', array('write'), array('lol', 'lol')); - $socket->expects($this->never()) - ->method('write'); - - $handler->setSocket($socket); - - $handler->handle($this->getRecordWithMessage(null)); - } - - protected function getRecordWithMessage($msg) - { - return array('message' => $msg, 'level' => \Monolog\Logger::WARNING, 'context' => null, 'extra' => array(), 'channel' => 'lol'); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/TestHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/TestHandlerTest.php deleted file mode 100644 index a7c4fc9..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/TestHandlerTest.php +++ /dev/null @@ -1,116 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; -use Monolog\Logger; - -/** - * @covers Monolog\Handler\TestHandler - */ -class TestHandlerTest extends TestCase -{ - /** - * @dataProvider methodProvider - */ - public function testHandler($method, $level) - { - $handler = new TestHandler; - $record = $this->getRecord($level, 'test'.$method); - $this->assertFalse($handler->hasRecords($level)); - $this->assertFalse($handler->hasRecord($record, $level)); - $this->assertFalse($handler->{'has'.$method}($record), 'has'.$method); - $this->assertFalse($handler->{'has'.$method.'ThatContains'}('test'), 'has'.$method.'ThatContains'); - $this->assertFalse($handler->{'has'.$method.'ThatPasses'}(function ($rec) { - return true; - }), 'has'.$method.'ThatPasses'); - $this->assertFalse($handler->{'has'.$method.'ThatMatches'}('/test\w+/')); - $this->assertFalse($handler->{'has'.$method.'Records'}(), 'has'.$method.'Records'); - $handler->handle($record); - - $this->assertFalse($handler->{'has'.$method}('bar'), 'has'.$method); - $this->assertTrue($handler->hasRecords($level)); - $this->assertTrue($handler->hasRecord($record, $level)); - $this->assertTrue($handler->{'has'.$method}($record), 'has'.$method); - $this->assertTrue($handler->{'has'.$method}('test'.$method), 'has'.$method); - $this->assertTrue($handler->{'has'.$method.'ThatContains'}('test'), 'has'.$method.'ThatContains'); - $this->assertTrue($handler->{'has'.$method.'ThatPasses'}(function ($rec) { - return true; - }), 'has'.$method.'ThatPasses'); - $this->assertTrue($handler->{'has'.$method.'ThatMatches'}('/test\w+/')); - $this->assertTrue($handler->{'has'.$method.'Records'}(), 'has'.$method.'Records'); - - $records = $handler->getRecords(); - unset($records[0]['formatted']); - $this->assertEquals(array($record), $records); - } - - public function testHandlerAssertEmptyContext() { - $handler = new TestHandler; - $record = $this->getRecord(Logger::WARNING, 'test', array()); - $this->assertFalse($handler->hasWarning(array( - 'message' => 'test', - 'context' => array(), - ))); - - $handler->handle($record); - - $this->assertTrue($handler->hasWarning(array( - 'message' => 'test', - 'context' => array(), - ))); - $this->assertFalse($handler->hasWarning(array( - 'message' => 'test', - 'context' => array( - 'foo' => 'bar' - ), - ))); - } - - public function testHandlerAssertNonEmptyContext() { - $handler = new TestHandler; - $record = $this->getRecord(Logger::WARNING, 'test', array('foo' => 'bar')); - $this->assertFalse($handler->hasWarning(array( - 'message' => 'test', - 'context' => array( - 'foo' => 'bar' - ), - ))); - - $handler->handle($record); - - $this->assertTrue($handler->hasWarning(array( - 'message' => 'test', - 'context' => array( - 'foo' => 'bar' - ), - ))); - $this->assertFalse($handler->hasWarning(array( - 'message' => 'test', - 'context' => array(), - ))); - } - - public function methodProvider() - { - return array( - array('Emergency', Logger::EMERGENCY), - array('Alert' , Logger::ALERT), - array('Critical' , Logger::CRITICAL), - array('Error' , Logger::ERROR), - array('Warning' , Logger::WARNING), - array('Info' , Logger::INFO), - array('Notice' , Logger::NOTICE), - array('Debug' , Logger::DEBUG), - ); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/UdpSocketTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/UdpSocketTest.php deleted file mode 100644 index fa524d0..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/UdpSocketTest.php +++ /dev/null @@ -1,64 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; -use Monolog\Handler\SyslogUdp\UdpSocket; - -/** - * @requires extension sockets - */ -class UdpSocketTest extends TestCase -{ - public function testWeDoNotTruncateShortMessages() - { - $socket = $this->getMock('\Monolog\Handler\SyslogUdp\UdpSocket', array('send'), array('lol', 'lol')); - - $socket->expects($this->at(0)) - ->method('send') - ->with("HEADER: The quick brown fox jumps over the lazy dog"); - - $socket->write("The quick brown fox jumps over the lazy dog", "HEADER: "); - } - - public function testLongMessagesAreTruncated() - { - $socket = $this->getMock('\Monolog\Handler\SyslogUdp\UdpSocket', array('send'), array('lol', 'lol')); - - $truncatedString = str_repeat("derp", 16254).'d'; - - $socket->expects($this->exactly(1)) - ->method('send') - ->with("HEADER" . $truncatedString); - - $longString = str_repeat("derp", 20000); - - $socket->write($longString, "HEADER"); - } - - public function testDoubleCloseDoesNotError() - { - $socket = new UdpSocket('127.0.0.1', 514); - $socket->close(); - $socket->close(); - } - - /** - * @expectedException LogicException - */ - public function testWriteAfterCloseErrors() - { - $socket = new UdpSocket('127.0.0.1', 514); - $socket->close(); - $socket->write('foo', "HEADER"); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/WhatFailureGroupHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/WhatFailureGroupHandlerTest.php deleted file mode 100644 index 0594a23..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/WhatFailureGroupHandlerTest.php +++ /dev/null @@ -1,144 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; -use Monolog\Logger; - -class WhatFailureGroupHandlerTest extends TestCase -{ - /** - * @covers Monolog\Handler\WhatFailureGroupHandler::__construct - * @expectedException InvalidArgumentException - */ - public function testConstructorOnlyTakesHandler() - { - new WhatFailureGroupHandler(array(new TestHandler(), "foo")); - } - - /** - * @covers Monolog\Handler\WhatFailureGroupHandler::__construct - * @covers Monolog\Handler\WhatFailureGroupHandler::handle - */ - public function testHandle() - { - $testHandlers = array(new TestHandler(), new TestHandler()); - $handler = new WhatFailureGroupHandler($testHandlers); - $handler->handle($this->getRecord(Logger::DEBUG)); - $handler->handle($this->getRecord(Logger::INFO)); - foreach ($testHandlers as $test) { - $this->assertTrue($test->hasDebugRecords()); - $this->assertTrue($test->hasInfoRecords()); - $this->assertTrue(count($test->getRecords()) === 2); - } - } - - /** - * @covers Monolog\Handler\WhatFailureGroupHandler::handleBatch - */ - public function testHandleBatch() - { - $testHandlers = array(new TestHandler(), new TestHandler()); - $handler = new WhatFailureGroupHandler($testHandlers); - $handler->handleBatch(array($this->getRecord(Logger::DEBUG), $this->getRecord(Logger::INFO))); - foreach ($testHandlers as $test) { - $this->assertTrue($test->hasDebugRecords()); - $this->assertTrue($test->hasInfoRecords()); - $this->assertTrue(count($test->getRecords()) === 2); - } - } - - /** - * @covers Monolog\Handler\WhatFailureGroupHandler::isHandling - */ - public function testIsHandling() - { - $testHandlers = array(new TestHandler(Logger::ERROR), new TestHandler(Logger::WARNING)); - $handler = new WhatFailureGroupHandler($testHandlers); - $this->assertTrue($handler->isHandling($this->getRecord(Logger::ERROR))); - $this->assertTrue($handler->isHandling($this->getRecord(Logger::WARNING))); - $this->assertFalse($handler->isHandling($this->getRecord(Logger::DEBUG))); - } - - /** - * @covers Monolog\Handler\WhatFailureGroupHandler::handle - */ - public function testHandleUsesProcessors() - { - $test = new TestHandler(); - $handler = new WhatFailureGroupHandler(array($test)); - $handler->pushProcessor(function ($record) { - $record['extra']['foo'] = true; - - return $record; - }); - $handler->handle($this->getRecord(Logger::WARNING)); - $this->assertTrue($test->hasWarningRecords()); - $records = $test->getRecords(); - $this->assertTrue($records[0]['extra']['foo']); - } - - /** - * @covers Monolog\Handler\WhatFailureGroupHandler::handleBatch - */ - public function testHandleBatchUsesProcessors() - { - $testHandlers = array(new TestHandler(), new TestHandler()); - $handler = new WhatFailureGroupHandler($testHandlers); - $handler->pushProcessor(function ($record) { - $record['extra']['foo'] = true; - - return $record; - }); - $handler->handleBatch(array($this->getRecord(Logger::DEBUG), $this->getRecord(Logger::INFO))); - foreach ($testHandlers as $test) { - $this->assertTrue($test->hasDebugRecords()); - $this->assertTrue($test->hasInfoRecords()); - $this->assertTrue(count($test->getRecords()) === 2); - $records = $test->getRecords(); - $this->assertTrue($records[0]['extra']['foo']); - $this->assertTrue($records[1]['extra']['foo']); - } - } - - /** - * @covers Monolog\Handler\WhatFailureGroupHandler::handle - */ - public function testHandleException() - { - $test = new TestHandler(); - $exception = new ExceptionTestHandler(); - $handler = new WhatFailureGroupHandler(array($exception, $test, $exception)); - $handler->pushProcessor(function ($record) { - $record['extra']['foo'] = true; - - return $record; - }); - $handler->handle($this->getRecord(Logger::WARNING)); - $this->assertTrue($test->hasWarningRecords()); - $records = $test->getRecords(); - $this->assertTrue($records[0]['extra']['foo']); - } -} - -class ExceptionTestHandler extends TestHandler -{ - /** - * {@inheritdoc} - */ - public function handle(array $record) - { - parent::handle($record); - - throw new \Exception("ExceptionTestHandler::handle"); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/ZendMonitorHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/ZendMonitorHandlerTest.php deleted file mode 100644 index 69b001e..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Handler/ZendMonitorHandlerTest.php +++ /dev/null @@ -1,69 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Handler; - -use Monolog\TestCase; - -class ZendMonitorHandlerTest extends TestCase -{ - protected $zendMonitorHandler; - - public function setUp() - { - if (!function_exists('zend_monitor_custom_event')) { - $this->markTestSkipped('ZendServer is not installed'); - } - } - - /** - * @covers Monolog\Handler\ZendMonitorHandler::write - */ - public function testWrite() - { - $record = $this->getRecord(); - $formatterResult = array( - 'message' => $record['message'], - ); - - $zendMonitor = $this->getMockBuilder('Monolog\Handler\ZendMonitorHandler') - ->setMethods(array('writeZendMonitorCustomEvent', 'getDefaultFormatter')) - ->getMock(); - - $formatterMock = $this->getMockBuilder('Monolog\Formatter\NormalizerFormatter') - ->disableOriginalConstructor() - ->getMock(); - - $formatterMock->expects($this->once()) - ->method('format') - ->will($this->returnValue($formatterResult)); - - $zendMonitor->expects($this->once()) - ->method('getDefaultFormatter') - ->will($this->returnValue($formatterMock)); - - $levelMap = $zendMonitor->getLevelMap(); - - $zendMonitor->expects($this->once()) - ->method('writeZendMonitorCustomEvent') - ->with($levelMap[$record['level']], $record['message'], $formatterResult); - - $zendMonitor->handle($record); - } - - /** - * @covers Monolog\Handler\ZendMonitorHandler::getDefaultFormatter - */ - public function testGetDefaultFormatterReturnsNormalizerFormatter() - { - $zendMonitor = new ZendMonitorHandler(); - $this->assertInstanceOf('Monolog\Formatter\NormalizerFormatter', $zendMonitor->getDefaultFormatter()); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/LoggerTest.php b/vendor/monolog/monolog/tests/Monolog/LoggerTest.php deleted file mode 100644 index 442e87d..0000000 --- a/vendor/monolog/monolog/tests/Monolog/LoggerTest.php +++ /dev/null @@ -1,690 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog; - -use Monolog\Processor\WebProcessor; -use Monolog\Handler\TestHandler; - -class LoggerTest extends \PHPUnit_Framework_TestCase -{ - /** - * @covers Monolog\Logger::getName - */ - public function testGetName() - { - $logger = new Logger('foo'); - $this->assertEquals('foo', $logger->getName()); - } - - /** - * @covers Monolog\Logger::getLevelName - */ - public function testGetLevelName() - { - $this->assertEquals('ERROR', Logger::getLevelName(Logger::ERROR)); - } - - /** - * @covers Monolog\Logger::withName - */ - public function testWithName() - { - $first = new Logger('first', array($handler = new TestHandler())); - $second = $first->withName('second'); - - $this->assertSame('first', $first->getName()); - $this->assertSame('second', $second->getName()); - $this->assertSame($handler, $second->popHandler()); - } - - /** - * @covers Monolog\Logger::toMonologLevel - */ - public function testConvertPSR3ToMonologLevel() - { - $this->assertEquals(Logger::toMonologLevel('debug'), 100); - $this->assertEquals(Logger::toMonologLevel('info'), 200); - $this->assertEquals(Logger::toMonologLevel('notice'), 250); - $this->assertEquals(Logger::toMonologLevel('warning'), 300); - $this->assertEquals(Logger::toMonologLevel('error'), 400); - $this->assertEquals(Logger::toMonologLevel('critical'), 500); - $this->assertEquals(Logger::toMonologLevel('alert'), 550); - $this->assertEquals(Logger::toMonologLevel('emergency'), 600); - } - - /** - * @covers Monolog\Logger::getLevelName - * @expectedException InvalidArgumentException - */ - public function testGetLevelNameThrows() - { - Logger::getLevelName(5); - } - - /** - * @covers Monolog\Logger::__construct - */ - public function testChannel() - { - $logger = new Logger('foo'); - $handler = new TestHandler; - $logger->pushHandler($handler); - $logger->addWarning('test'); - list($record) = $handler->getRecords(); - $this->assertEquals('foo', $record['channel']); - } - - /** - * @covers Monolog\Logger::addRecord - */ - public function testLog() - { - $logger = new Logger(__METHOD__); - - $handler = $this->getMock('Monolog\Handler\NullHandler', array('handle')); - $handler->expects($this->once()) - ->method('handle'); - $logger->pushHandler($handler); - - $this->assertTrue($logger->addWarning('test')); - } - - /** - * @covers Monolog\Logger::addRecord - */ - public function testLogNotHandled() - { - $logger = new Logger(__METHOD__); - - $handler = $this->getMock('Monolog\Handler\NullHandler', array('handle'), array(Logger::ERROR)); - $handler->expects($this->never()) - ->method('handle'); - $logger->pushHandler($handler); - - $this->assertFalse($logger->addWarning('test')); - } - - public function testHandlersInCtor() - { - $handler1 = new TestHandler; - $handler2 = new TestHandler; - $logger = new Logger(__METHOD__, array($handler1, $handler2)); - - $this->assertEquals($handler1, $logger->popHandler()); - $this->assertEquals($handler2, $logger->popHandler()); - } - - public function testProcessorsInCtor() - { - $processor1 = new WebProcessor; - $processor2 = new WebProcessor; - $logger = new Logger(__METHOD__, array(), array($processor1, $processor2)); - - $this->assertEquals($processor1, $logger->popProcessor()); - $this->assertEquals($processor2, $logger->popProcessor()); - } - - /** - * @covers Monolog\Logger::pushHandler - * @covers Monolog\Logger::popHandler - * @expectedException LogicException - */ - public function testPushPopHandler() - { - $logger = new Logger(__METHOD__); - $handler1 = new TestHandler; - $handler2 = new TestHandler; - - $logger->pushHandler($handler1); - $logger->pushHandler($handler2); - - $this->assertEquals($handler2, $logger->popHandler()); - $this->assertEquals($handler1, $logger->popHandler()); - $logger->popHandler(); - } - - /** - * @covers Monolog\Logger::setHandlers - */ - public function testSetHandlers() - { - $logger = new Logger(__METHOD__); - $handler1 = new TestHandler; - $handler2 = new TestHandler; - - $logger->pushHandler($handler1); - $logger->setHandlers(array($handler2)); - - // handler1 has been removed - $this->assertEquals(array($handler2), $logger->getHandlers()); - - $logger->setHandlers(array( - "AMapKey" => $handler1, - "Woop" => $handler2, - )); - - // Keys have been scrubbed - $this->assertEquals(array($handler1, $handler2), $logger->getHandlers()); - } - - /** - * @covers Monolog\Logger::pushProcessor - * @covers Monolog\Logger::popProcessor - * @expectedException LogicException - */ - public function testPushPopProcessor() - { - $logger = new Logger(__METHOD__); - $processor1 = new WebProcessor; - $processor2 = new WebProcessor; - - $logger->pushProcessor($processor1); - $logger->pushProcessor($processor2); - - $this->assertEquals($processor2, $logger->popProcessor()); - $this->assertEquals($processor1, $logger->popProcessor()); - $logger->popProcessor(); - } - - /** - * @covers Monolog\Logger::pushProcessor - * @expectedException InvalidArgumentException - */ - public function testPushProcessorWithNonCallable() - { - $logger = new Logger(__METHOD__); - - $logger->pushProcessor(new \stdClass()); - } - - /** - * @covers Monolog\Logger::addRecord - */ - public function testProcessorsAreExecuted() - { - $logger = new Logger(__METHOD__); - $handler = new TestHandler; - $logger->pushHandler($handler); - $logger->pushProcessor(function ($record) { - $record['extra']['win'] = true; - - return $record; - }); - $logger->addError('test'); - list($record) = $handler->getRecords(); - $this->assertTrue($record['extra']['win']); - } - - /** - * @covers Monolog\Logger::addRecord - */ - public function testProcessorsAreCalledOnlyOnce() - { - $logger = new Logger(__METHOD__); - $handler = $this->getMock('Monolog\Handler\HandlerInterface'); - $handler->expects($this->any()) - ->method('isHandling') - ->will($this->returnValue(true)) - ; - $handler->expects($this->any()) - ->method('handle') - ->will($this->returnValue(true)) - ; - $logger->pushHandler($handler); - - $processor = $this->getMockBuilder('Monolog\Processor\WebProcessor') - ->disableOriginalConstructor() - ->setMethods(array('__invoke')) - ->getMock() - ; - $processor->expects($this->once()) - ->method('__invoke') - ->will($this->returnArgument(0)) - ; - $logger->pushProcessor($processor); - - $logger->addError('test'); - } - - /** - * @covers Monolog\Logger::addRecord - */ - public function testProcessorsNotCalledWhenNotHandled() - { - $logger = new Logger(__METHOD__); - $handler = $this->getMock('Monolog\Handler\HandlerInterface'); - $handler->expects($this->once()) - ->method('isHandling') - ->will($this->returnValue(false)) - ; - $logger->pushHandler($handler); - $that = $this; - $logger->pushProcessor(function ($record) use ($that) { - $that->fail('The processor should not be called'); - }); - $logger->addAlert('test'); - } - - /** - * @covers Monolog\Logger::addRecord - */ - public function testHandlersNotCalledBeforeFirstHandling() - { - $logger = new Logger(__METHOD__); - - $handler1 = $this->getMock('Monolog\Handler\HandlerInterface'); - $handler1->expects($this->never()) - ->method('isHandling') - ->will($this->returnValue(false)) - ; - $handler1->expects($this->once()) - ->method('handle') - ->will($this->returnValue(false)) - ; - $logger->pushHandler($handler1); - - $handler2 = $this->getMock('Monolog\Handler\HandlerInterface'); - $handler2->expects($this->once()) - ->method('isHandling') - ->will($this->returnValue(true)) - ; - $handler2->expects($this->once()) - ->method('handle') - ->will($this->returnValue(false)) - ; - $logger->pushHandler($handler2); - - $handler3 = $this->getMock('Monolog\Handler\HandlerInterface'); - $handler3->expects($this->once()) - ->method('isHandling') - ->will($this->returnValue(false)) - ; - $handler3->expects($this->never()) - ->method('handle') - ; - $logger->pushHandler($handler3); - - $logger->debug('test'); - } - - /** - * @covers Monolog\Logger::addRecord - */ - public function testHandlersNotCalledBeforeFirstHandlingWithAssocArray() - { - $handler1 = $this->getMock('Monolog\Handler\HandlerInterface'); - $handler1->expects($this->never()) - ->method('isHandling') - ->will($this->returnValue(false)) - ; - $handler1->expects($this->once()) - ->method('handle') - ->will($this->returnValue(false)) - ; - - $handler2 = $this->getMock('Monolog\Handler\HandlerInterface'); - $handler2->expects($this->once()) - ->method('isHandling') - ->will($this->returnValue(true)) - ; - $handler2->expects($this->once()) - ->method('handle') - ->will($this->returnValue(false)) - ; - - $handler3 = $this->getMock('Monolog\Handler\HandlerInterface'); - $handler3->expects($this->once()) - ->method('isHandling') - ->will($this->returnValue(false)) - ; - $handler3->expects($this->never()) - ->method('handle') - ; - - $logger = new Logger(__METHOD__, array('last' => $handler3, 'second' => $handler2, 'first' => $handler1)); - - $logger->debug('test'); - } - - /** - * @covers Monolog\Logger::addRecord - */ - public function testBubblingWhenTheHandlerReturnsFalse() - { - $logger = new Logger(__METHOD__); - - $handler1 = $this->getMock('Monolog\Handler\HandlerInterface'); - $handler1->expects($this->any()) - ->method('isHandling') - ->will($this->returnValue(true)) - ; - $handler1->expects($this->once()) - ->method('handle') - ->will($this->returnValue(false)) - ; - $logger->pushHandler($handler1); - - $handler2 = $this->getMock('Monolog\Handler\HandlerInterface'); - $handler2->expects($this->any()) - ->method('isHandling') - ->will($this->returnValue(true)) - ; - $handler2->expects($this->once()) - ->method('handle') - ->will($this->returnValue(false)) - ; - $logger->pushHandler($handler2); - - $logger->debug('test'); - } - - /** - * @covers Monolog\Logger::addRecord - */ - public function testNotBubblingWhenTheHandlerReturnsTrue() - { - $logger = new Logger(__METHOD__); - - $handler1 = $this->getMock('Monolog\Handler\HandlerInterface'); - $handler1->expects($this->any()) - ->method('isHandling') - ->will($this->returnValue(true)) - ; - $handler1->expects($this->never()) - ->method('handle') - ; - $logger->pushHandler($handler1); - - $handler2 = $this->getMock('Monolog\Handler\HandlerInterface'); - $handler2->expects($this->any()) - ->method('isHandling') - ->will($this->returnValue(true)) - ; - $handler2->expects($this->once()) - ->method('handle') - ->will($this->returnValue(true)) - ; - $logger->pushHandler($handler2); - - $logger->debug('test'); - } - - /** - * @covers Monolog\Logger::isHandling - */ - public function testIsHandling() - { - $logger = new Logger(__METHOD__); - - $handler1 = $this->getMock('Monolog\Handler\HandlerInterface'); - $handler1->expects($this->any()) - ->method('isHandling') - ->will($this->returnValue(false)) - ; - - $logger->pushHandler($handler1); - $this->assertFalse($logger->isHandling(Logger::DEBUG)); - - $handler2 = $this->getMock('Monolog\Handler\HandlerInterface'); - $handler2->expects($this->any()) - ->method('isHandling') - ->will($this->returnValue(true)) - ; - - $logger->pushHandler($handler2); - $this->assertTrue($logger->isHandling(Logger::DEBUG)); - } - - /** - * @dataProvider logMethodProvider - * @covers Monolog\Logger::addDebug - * @covers Monolog\Logger::addInfo - * @covers Monolog\Logger::addNotice - * @covers Monolog\Logger::addWarning - * @covers Monolog\Logger::addError - * @covers Monolog\Logger::addCritical - * @covers Monolog\Logger::addAlert - * @covers Monolog\Logger::addEmergency - * @covers Monolog\Logger::debug - * @covers Monolog\Logger::info - * @covers Monolog\Logger::notice - * @covers Monolog\Logger::warn - * @covers Monolog\Logger::err - * @covers Monolog\Logger::crit - * @covers Monolog\Logger::alert - * @covers Monolog\Logger::emerg - */ - public function testLogMethods($method, $expectedLevel) - { - $logger = new Logger('foo'); - $handler = new TestHandler; - $logger->pushHandler($handler); - $logger->{$method}('test'); - list($record) = $handler->getRecords(); - $this->assertEquals($expectedLevel, $record['level']); - } - - public function logMethodProvider() - { - return array( - // monolog methods - array('addDebug', Logger::DEBUG), - array('addInfo', Logger::INFO), - array('addNotice', Logger::NOTICE), - array('addWarning', Logger::WARNING), - array('addError', Logger::ERROR), - array('addCritical', Logger::CRITICAL), - array('addAlert', Logger::ALERT), - array('addEmergency', Logger::EMERGENCY), - - // ZF/Sf2 compat methods - array('debug', Logger::DEBUG), - array('info', Logger::INFO), - array('notice', Logger::NOTICE), - array('warn', Logger::WARNING), - array('err', Logger::ERROR), - array('crit', Logger::CRITICAL), - array('alert', Logger::ALERT), - array('emerg', Logger::EMERGENCY), - ); - } - - /** - * @dataProvider setTimezoneProvider - * @covers Monolog\Logger::setTimezone - */ - public function testSetTimezone($tz) - { - Logger::setTimezone($tz); - $logger = new Logger('foo'); - $handler = new TestHandler; - $logger->pushHandler($handler); - $logger->info('test'); - list($record) = $handler->getRecords(); - $this->assertEquals($tz, $record['datetime']->getTimezone()); - } - - public function setTimezoneProvider() - { - return array_map( - function ($tz) { return array(new \DateTimeZone($tz)); }, - \DateTimeZone::listIdentifiers() - ); - } - - /** - * @dataProvider useMicrosecondTimestampsProvider - * @covers Monolog\Logger::useMicrosecondTimestamps - * @covers Monolog\Logger::addRecord - */ - public function testUseMicrosecondTimestamps($micro, $assert) - { - $logger = new Logger('foo'); - $logger->useMicrosecondTimestamps($micro); - $handler = new TestHandler; - $logger->pushHandler($handler); - $logger->info('test'); - list($record) = $handler->getRecords(); - $this->{$assert}('000000', $record['datetime']->format('u')); - } - - public function useMicrosecondTimestampsProvider() - { - return array( - // this has a very small chance of a false negative (1/10^6) - 'with microseconds' => array(true, 'assertNotSame'), - 'without microseconds' => array(false, PHP_VERSION_ID >= 70100 ? 'assertNotSame' : 'assertSame'), - ); - } - - /** - * @covers Monolog\Logger::setExceptionHandler - */ - public function testSetExceptionHandler() - { - $logger = new Logger(__METHOD__); - $this->assertNull($logger->getExceptionHandler()); - $callback = function ($ex) { - }; - $logger->setExceptionHandler($callback); - $this->assertEquals($callback, $logger->getExceptionHandler()); - } - - /** - * @covers Monolog\Logger::setExceptionHandler - * @expectedException InvalidArgumentException - */ - public function testBadExceptionHandlerType() - { - $logger = new Logger(__METHOD__); - $logger->setExceptionHandler(false); - } - - /** - * @covers Monolog\Logger::handleException - * @expectedException Exception - */ - public function testDefaultHandleException() - { - $logger = new Logger(__METHOD__); - $handler = $this->getMock('Monolog\Handler\HandlerInterface'); - $handler->expects($this->any()) - ->method('isHandling') - ->will($this->returnValue(true)) - ; - $handler->expects($this->any()) - ->method('handle') - ->will($this->throwException(new \Exception('Some handler exception'))) - ; - $logger->pushHandler($handler); - $logger->info('test'); - } - - /** - * @covers Monolog\Logger::handleException - * @covers Monolog\Logger::addRecord - */ - public function testCustomHandleException() - { - $logger = new Logger(__METHOD__); - $that = $this; - $logger->setExceptionHandler(function ($e, $record) use ($that) { - $that->assertEquals($e->getMessage(), 'Some handler exception'); - $that->assertTrue(is_array($record)); - $that->assertEquals($record['message'], 'test'); - }); - $handler = $this->getMock('Monolog\Handler\HandlerInterface'); - $handler->expects($this->any()) - ->method('isHandling') - ->will($this->returnValue(true)) - ; - $handler->expects($this->any()) - ->method('handle') - ->will($this->throwException(new \Exception('Some handler exception'))) - ; - $logger->pushHandler($handler); - $logger->info('test'); - } - - public function testReset() - { - $logger = new Logger('app'); - - $testHandler = new Handler\TestHandler(); - $bufferHandler = new Handler\BufferHandler($testHandler); - $groupHandler = new Handler\GroupHandler(array($bufferHandler)); - $fingersCrossedHandler = new Handler\FingersCrossedHandler($groupHandler); - - $logger->pushHandler($fingersCrossedHandler); - - $processorUid1 = new Processor\UidProcessor(10); - $uid1 = $processorUid1->getUid(); - $groupHandler->pushProcessor($processorUid1); - - $processorUid2 = new Processor\UidProcessor(5); - $uid2 = $processorUid2->getUid(); - $logger->pushProcessor($processorUid2); - - $getProperty = function ($object, $property) { - $reflectionProperty = new \ReflectionProperty(get_class($object), $property); - $reflectionProperty->setAccessible(true); - - return $reflectionProperty->getValue($object); - }; - $that = $this; - $assertBufferOfBufferHandlerEmpty = function () use ($getProperty, $bufferHandler, $that) { - $that->assertEmpty($getProperty($bufferHandler, 'buffer')); - }; - $assertBuffersEmpty = function() use ($assertBufferOfBufferHandlerEmpty, $getProperty, $fingersCrossedHandler, $that) { - $assertBufferOfBufferHandlerEmpty(); - $that->assertEmpty($getProperty($fingersCrossedHandler, 'buffer')); - }; - - $logger->debug('debug'); - $logger->reset(); - $assertBuffersEmpty(); - $this->assertFalse($testHandler->hasDebugRecords()); - $this->assertFalse($testHandler->hasErrorRecords()); - $this->assertNotSame($uid1, $uid1 = $processorUid1->getUid()); - $this->assertNotSame($uid2, $uid2 = $processorUid2->getUid()); - - $logger->debug('debug'); - $logger->error('error'); - $logger->reset(); - $assertBuffersEmpty(); - $this->assertTrue($testHandler->hasDebugRecords()); - $this->assertTrue($testHandler->hasErrorRecords()); - $this->assertNotSame($uid1, $uid1 = $processorUid1->getUid()); - $this->assertNotSame($uid2, $uid2 = $processorUid2->getUid()); - - $logger->info('info'); - $this->assertNotEmpty($getProperty($fingersCrossedHandler, 'buffer')); - $assertBufferOfBufferHandlerEmpty(); - $this->assertFalse($testHandler->hasInfoRecords()); - - $logger->reset(); - $assertBuffersEmpty(); - $this->assertFalse($testHandler->hasInfoRecords()); - $this->assertNotSame($uid1, $uid1 = $processorUid1->getUid()); - $this->assertNotSame($uid2, $uid2 = $processorUid2->getUid()); - - $logger->notice('notice'); - $logger->emergency('emergency'); - $logger->reset(); - $assertBuffersEmpty(); - $this->assertFalse($testHandler->hasInfoRecords()); - $this->assertTrue($testHandler->hasNoticeRecords()); - $this->assertTrue($testHandler->hasEmergencyRecords()); - $this->assertNotSame($uid1, $processorUid1->getUid()); - $this->assertNotSame($uid2, $processorUid2->getUid()); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Processor/GitProcessorTest.php b/vendor/monolog/monolog/tests/Monolog/Processor/GitProcessorTest.php deleted file mode 100644 index 5adb505..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Processor/GitProcessorTest.php +++ /dev/null @@ -1,29 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Processor; - -use Monolog\TestCase; - -class GitProcessorTest extends TestCase -{ - /** - * @covers Monolog\Processor\GitProcessor::__invoke - */ - public function testProcessor() - { - $processor = new GitProcessor(); - $record = $processor($this->getRecord()); - - $this->assertArrayHasKey('git', $record['extra']); - $this->assertTrue(!is_array($record['extra']['git']['branch'])); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Processor/IntrospectionProcessorTest.php b/vendor/monolog/monolog/tests/Monolog/Processor/IntrospectionProcessorTest.php deleted file mode 100644 index 0dd411d..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Processor/IntrospectionProcessorTest.php +++ /dev/null @@ -1,123 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Acme; - -class Tester -{ - public function test($handler, $record) - { - $handler->handle($record); - } -} - -function tester($handler, $record) -{ - $handler->handle($record); -} - -namespace Monolog\Processor; - -use Monolog\Logger; -use Monolog\TestCase; -use Monolog\Handler\TestHandler; - -class IntrospectionProcessorTest extends TestCase -{ - public function getHandler() - { - $processor = new IntrospectionProcessor(); - $handler = new TestHandler(); - $handler->pushProcessor($processor); - - return $handler; - } - - public function testProcessorFromClass() - { - $handler = $this->getHandler(); - $tester = new \Acme\Tester; - $tester->test($handler, $this->getRecord()); - list($record) = $handler->getRecords(); - $this->assertEquals(__FILE__, $record['extra']['file']); - $this->assertEquals(18, $record['extra']['line']); - $this->assertEquals('Acme\Tester', $record['extra']['class']); - $this->assertEquals('test', $record['extra']['function']); - } - - public function testProcessorFromFunc() - { - $handler = $this->getHandler(); - \Acme\tester($handler, $this->getRecord()); - list($record) = $handler->getRecords(); - $this->assertEquals(__FILE__, $record['extra']['file']); - $this->assertEquals(24, $record['extra']['line']); - $this->assertEquals(null, $record['extra']['class']); - $this->assertEquals('Acme\tester', $record['extra']['function']); - } - - public function testLevelTooLow() - { - $input = array( - 'level' => Logger::DEBUG, - 'extra' => array(), - ); - - $expected = $input; - - $processor = new IntrospectionProcessor(Logger::CRITICAL); - $actual = $processor($input); - - $this->assertEquals($expected, $actual); - } - - public function testLevelEqual() - { - $input = array( - 'level' => Logger::CRITICAL, - 'extra' => array(), - ); - - $expected = $input; - $expected['extra'] = array( - 'file' => null, - 'line' => null, - 'class' => 'ReflectionMethod', - 'function' => 'invokeArgs', - ); - - $processor = new IntrospectionProcessor(Logger::CRITICAL); - $actual = $processor($input); - - $this->assertEquals($expected, $actual); - } - - public function testLevelHigher() - { - $input = array( - 'level' => Logger::EMERGENCY, - 'extra' => array(), - ); - - $expected = $input; - $expected['extra'] = array( - 'file' => null, - 'line' => null, - 'class' => 'ReflectionMethod', - 'function' => 'invokeArgs', - ); - - $processor = new IntrospectionProcessor(Logger::CRITICAL); - $actual = $processor($input); - - $this->assertEquals($expected, $actual); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Processor/MemoryPeakUsageProcessorTest.php b/vendor/monolog/monolog/tests/Monolog/Processor/MemoryPeakUsageProcessorTest.php deleted file mode 100644 index eb66614..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Processor/MemoryPeakUsageProcessorTest.php +++ /dev/null @@ -1,42 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Processor; - -use Monolog\TestCase; - -class MemoryPeakUsageProcessorTest extends TestCase -{ - /** - * @covers Monolog\Processor\MemoryPeakUsageProcessor::__invoke - * @covers Monolog\Processor\MemoryProcessor::formatBytes - */ - public function testProcessor() - { - $processor = new MemoryPeakUsageProcessor(); - $record = $processor($this->getRecord()); - $this->assertArrayHasKey('memory_peak_usage', $record['extra']); - $this->assertRegExp('#[0-9.]+ (M|K)?B$#', $record['extra']['memory_peak_usage']); - } - - /** - * @covers Monolog\Processor\MemoryPeakUsageProcessor::__invoke - * @covers Monolog\Processor\MemoryProcessor::formatBytes - */ - public function testProcessorWithoutFormatting() - { - $processor = new MemoryPeakUsageProcessor(true, false); - $record = $processor($this->getRecord()); - $this->assertArrayHasKey('memory_peak_usage', $record['extra']); - $this->assertInternalType('int', $record['extra']['memory_peak_usage']); - $this->assertGreaterThan(0, $record['extra']['memory_peak_usage']); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Processor/MemoryUsageProcessorTest.php b/vendor/monolog/monolog/tests/Monolog/Processor/MemoryUsageProcessorTest.php deleted file mode 100644 index 4692dbf..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Processor/MemoryUsageProcessorTest.php +++ /dev/null @@ -1,42 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Processor; - -use Monolog\TestCase; - -class MemoryUsageProcessorTest extends TestCase -{ - /** - * @covers Monolog\Processor\MemoryUsageProcessor::__invoke - * @covers Monolog\Processor\MemoryProcessor::formatBytes - */ - public function testProcessor() - { - $processor = new MemoryUsageProcessor(); - $record = $processor($this->getRecord()); - $this->assertArrayHasKey('memory_usage', $record['extra']); - $this->assertRegExp('#[0-9.]+ (M|K)?B$#', $record['extra']['memory_usage']); - } - - /** - * @covers Monolog\Processor\MemoryUsageProcessor::__invoke - * @covers Monolog\Processor\MemoryProcessor::formatBytes - */ - public function testProcessorWithoutFormatting() - { - $processor = new MemoryUsageProcessor(true, false); - $record = $processor($this->getRecord()); - $this->assertArrayHasKey('memory_usage', $record['extra']); - $this->assertInternalType('int', $record['extra']['memory_usage']); - $this->assertGreaterThan(0, $record['extra']['memory_usage']); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Processor/MercurialProcessorTest.php b/vendor/monolog/monolog/tests/Monolog/Processor/MercurialProcessorTest.php deleted file mode 100644 index 11f2b35..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Processor/MercurialProcessorTest.php +++ /dev/null @@ -1,41 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Processor; - -use Monolog\TestCase; - -class MercurialProcessorTest extends TestCase -{ - /** - * @covers Monolog\Processor\MercurialProcessor::__invoke - */ - public function testProcessor() - { - if (defined('PHP_WINDOWS_VERSION_BUILD')) { - exec("where hg 2>NUL", $output, $result); - } else { - exec("which hg 2>/dev/null >/dev/null", $output, $result); - } - if ($result != 0) { - $this->markTestSkipped('hg is missing'); - return; - } - - `hg init`; - $processor = new MercurialProcessor(); - $record = $processor($this->getRecord()); - - $this->assertArrayHasKey('hg', $record['extra']); - $this->assertTrue(!is_array($record['extra']['hg']['branch'])); - $this->assertTrue(!is_array($record['extra']['hg']['revision'])); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Processor/ProcessIdProcessorTest.php b/vendor/monolog/monolog/tests/Monolog/Processor/ProcessIdProcessorTest.php deleted file mode 100644 index 458d2a3..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Processor/ProcessIdProcessorTest.php +++ /dev/null @@ -1,30 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Processor; - -use Monolog\TestCase; - -class ProcessIdProcessorTest extends TestCase -{ - /** - * @covers Monolog\Processor\ProcessIdProcessor::__invoke - */ - public function testProcessor() - { - $processor = new ProcessIdProcessor(); - $record = $processor($this->getRecord()); - $this->assertArrayHasKey('process_id', $record['extra']); - $this->assertInternalType('int', $record['extra']['process_id']); - $this->assertGreaterThan(0, $record['extra']['process_id']); - $this->assertEquals(getmypid(), $record['extra']['process_id']); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Processor/PsrLogMessageProcessorTest.php b/vendor/monolog/monolog/tests/Monolog/Processor/PsrLogMessageProcessorTest.php deleted file mode 100644 index 029a0c0..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Processor/PsrLogMessageProcessorTest.php +++ /dev/null @@ -1,43 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Processor; - -class PsrLogMessageProcessorTest extends \PHPUnit_Framework_TestCase -{ - /** - * @dataProvider getPairs - */ - public function testReplacement($val, $expected) - { - $proc = new PsrLogMessageProcessor; - - $message = $proc(array( - 'message' => '{foo}', - 'context' => array('foo' => $val), - )); - $this->assertEquals($expected, $message['message']); - } - - public function getPairs() - { - return array( - array('foo', 'foo'), - array('3', '3'), - array(3, '3'), - array(null, ''), - array(true, '1'), - array(false, ''), - array(new \stdClass, '[object stdClass]'), - array(array(), '[array]'), - ); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Processor/TagProcessorTest.php b/vendor/monolog/monolog/tests/Monolog/Processor/TagProcessorTest.php deleted file mode 100644 index 0d860c6..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Processor/TagProcessorTest.php +++ /dev/null @@ -1,49 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Processor; - -use Monolog\TestCase; - -class TagProcessorTest extends TestCase -{ - /** - * @covers Monolog\Processor\TagProcessor::__invoke - */ - public function testProcessor() - { - $tags = array(1, 2, 3); - $processor = new TagProcessor($tags); - $record = $processor($this->getRecord()); - - $this->assertEquals($tags, $record['extra']['tags']); - } - - /** - * @covers Monolog\Processor\TagProcessor::__invoke - */ - public function testProcessorTagModification() - { - $tags = array(1, 2, 3); - $processor = new TagProcessor($tags); - - $record = $processor($this->getRecord()); - $this->assertEquals($tags, $record['extra']['tags']); - - $processor->setTags(array('a', 'b')); - $record = $processor($this->getRecord()); - $this->assertEquals(array('a', 'b'), $record['extra']['tags']); - - $processor->addTags(array('a', 'c', 'foo' => 'bar')); - $record = $processor($this->getRecord()); - $this->assertEquals(array('a', 'b', 'a', 'c', 'foo' => 'bar'), $record['extra']['tags']); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Processor/UidProcessorTest.php b/vendor/monolog/monolog/tests/Monolog/Processor/UidProcessorTest.php deleted file mode 100644 index 5d13058..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Processor/UidProcessorTest.php +++ /dev/null @@ -1,33 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Processor; - -use Monolog\TestCase; - -class UidProcessorTest extends TestCase -{ - /** - * @covers Monolog\Processor\UidProcessor::__invoke - */ - public function testProcessor() - { - $processor = new UidProcessor(); - $record = $processor($this->getRecord()); - $this->assertArrayHasKey('uid', $record['extra']); - } - - public function testGetUid() - { - $processor = new UidProcessor(10); - $this->assertEquals(10, strlen($processor->getUid())); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/Processor/WebProcessorTest.php b/vendor/monolog/monolog/tests/Monolog/Processor/WebProcessorTest.php deleted file mode 100644 index 4105baf..0000000 --- a/vendor/monolog/monolog/tests/Monolog/Processor/WebProcessorTest.php +++ /dev/null @@ -1,113 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Processor; - -use Monolog\TestCase; - -class WebProcessorTest extends TestCase -{ - public function testProcessor() - { - $server = array( - 'REQUEST_URI' => 'A', - 'REMOTE_ADDR' => 'B', - 'REQUEST_METHOD' => 'C', - 'HTTP_REFERER' => 'D', - 'SERVER_NAME' => 'F', - 'UNIQUE_ID' => 'G', - ); - - $processor = new WebProcessor($server); - $record = $processor($this->getRecord()); - $this->assertEquals($server['REQUEST_URI'], $record['extra']['url']); - $this->assertEquals($server['REMOTE_ADDR'], $record['extra']['ip']); - $this->assertEquals($server['REQUEST_METHOD'], $record['extra']['http_method']); - $this->assertEquals($server['HTTP_REFERER'], $record['extra']['referrer']); - $this->assertEquals($server['SERVER_NAME'], $record['extra']['server']); - $this->assertEquals($server['UNIQUE_ID'], $record['extra']['unique_id']); - } - - public function testProcessorDoNothingIfNoRequestUri() - { - $server = array( - 'REMOTE_ADDR' => 'B', - 'REQUEST_METHOD' => 'C', - ); - $processor = new WebProcessor($server); - $record = $processor($this->getRecord()); - $this->assertEmpty($record['extra']); - } - - public function testProcessorReturnNullIfNoHttpReferer() - { - $server = array( - 'REQUEST_URI' => 'A', - 'REMOTE_ADDR' => 'B', - 'REQUEST_METHOD' => 'C', - 'SERVER_NAME' => 'F', - ); - $processor = new WebProcessor($server); - $record = $processor($this->getRecord()); - $this->assertNull($record['extra']['referrer']); - } - - public function testProcessorDoesNotAddUniqueIdIfNotPresent() - { - $server = array( - 'REQUEST_URI' => 'A', - 'REMOTE_ADDR' => 'B', - 'REQUEST_METHOD' => 'C', - 'SERVER_NAME' => 'F', - ); - $processor = new WebProcessor($server); - $record = $processor($this->getRecord()); - $this->assertFalse(isset($record['extra']['unique_id'])); - } - - public function testProcessorAddsOnlyRequestedExtraFields() - { - $server = array( - 'REQUEST_URI' => 'A', - 'REMOTE_ADDR' => 'B', - 'REQUEST_METHOD' => 'C', - 'SERVER_NAME' => 'F', - ); - - $processor = new WebProcessor($server, array('url', 'http_method')); - $record = $processor($this->getRecord()); - - $this->assertSame(array('url' => 'A', 'http_method' => 'C'), $record['extra']); - } - - public function testProcessorConfiguringOfExtraFields() - { - $server = array( - 'REQUEST_URI' => 'A', - 'REMOTE_ADDR' => 'B', - 'REQUEST_METHOD' => 'C', - 'SERVER_NAME' => 'F', - ); - - $processor = new WebProcessor($server, array('url' => 'REMOTE_ADDR')); - $record = $processor($this->getRecord()); - - $this->assertSame(array('url' => 'B'), $record['extra']); - } - - /** - * @expectedException UnexpectedValueException - */ - public function testInvalidData() - { - new WebProcessor(new \stdClass); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/PsrLogCompatTest.php b/vendor/monolog/monolog/tests/Monolog/PsrLogCompatTest.php deleted file mode 100644 index ab89944..0000000 --- a/vendor/monolog/monolog/tests/Monolog/PsrLogCompatTest.php +++ /dev/null @@ -1,47 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog; - -use Monolog\Handler\TestHandler; -use Monolog\Formatter\LineFormatter; -use Monolog\Processor\PsrLogMessageProcessor; -use Psr\Log\Test\LoggerInterfaceTest; - -class PsrLogCompatTest extends LoggerInterfaceTest -{ - private $handler; - - public function getLogger() - { - $logger = new Logger('foo'); - $logger->pushHandler($handler = new TestHandler); - $logger->pushProcessor(new PsrLogMessageProcessor); - $handler->setFormatter(new LineFormatter('%level_name% %message%')); - - $this->handler = $handler; - - return $logger; - } - - public function getLogs() - { - $convert = function ($record) { - $lower = function ($match) { - return strtolower($match[0]); - }; - - return preg_replace_callback('{^[A-Z]+}', $lower, $record['formatted']); - }; - - return array_map($convert, $this->handler->getRecords()); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/RegistryTest.php b/vendor/monolog/monolog/tests/Monolog/RegistryTest.php deleted file mode 100644 index 15fdfbd..0000000 --- a/vendor/monolog/monolog/tests/Monolog/RegistryTest.php +++ /dev/null @@ -1,153 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog; - -class RegistryTest extends \PHPUnit_Framework_TestCase -{ - protected function setUp() - { - Registry::clear(); - } - - /** - * @dataProvider hasLoggerProvider - * @covers Monolog\Registry::hasLogger - */ - public function testHasLogger(array $loggersToAdd, array $loggersToCheck, array $expectedResult) - { - foreach ($loggersToAdd as $loggerToAdd) { - Registry::addLogger($loggerToAdd); - } - foreach ($loggersToCheck as $index => $loggerToCheck) { - $this->assertSame($expectedResult[$index], Registry::hasLogger($loggerToCheck)); - } - } - - public function hasLoggerProvider() - { - $logger1 = new Logger('test1'); - $logger2 = new Logger('test2'); - $logger3 = new Logger('test3'); - - return array( - // only instances - array( - array($logger1), - array($logger1, $logger2), - array(true, false), - ), - // only names - array( - array($logger1), - array('test1', 'test2'), - array(true, false), - ), - // mixed case - array( - array($logger1, $logger2), - array('test1', $logger2, 'test3', $logger3), - array(true, true, false, false), - ), - ); - } - - /** - * @covers Monolog\Registry::clear - */ - public function testClearClears() - { - Registry::addLogger(new Logger('test1'), 'log'); - Registry::clear(); - - $this->setExpectedException('\InvalidArgumentException'); - Registry::getInstance('log'); - } - - /** - * @dataProvider removedLoggerProvider - * @covers Monolog\Registry::addLogger - * @covers Monolog\Registry::removeLogger - */ - public function testRemovesLogger($loggerToAdd, $remove) - { - Registry::addLogger($loggerToAdd); - Registry::removeLogger($remove); - - $this->setExpectedException('\InvalidArgumentException'); - Registry::getInstance($loggerToAdd->getName()); - } - - public function removedLoggerProvider() - { - $logger1 = new Logger('test1'); - - return array( - array($logger1, $logger1), - array($logger1, 'test1'), - ); - } - - /** - * @covers Monolog\Registry::addLogger - * @covers Monolog\Registry::getInstance - * @covers Monolog\Registry::__callStatic - */ - public function testGetsSameLogger() - { - $logger1 = new Logger('test1'); - $logger2 = new Logger('test2'); - - Registry::addLogger($logger1, 'test1'); - Registry::addLogger($logger2); - - $this->assertSame($logger1, Registry::getInstance('test1')); - $this->assertSame($logger2, Registry::test2()); - } - - /** - * @expectedException \InvalidArgumentException - * @covers Monolog\Registry::getInstance - */ - public function testFailsOnNonExistantLogger() - { - Registry::getInstance('test1'); - } - - /** - * @covers Monolog\Registry::addLogger - */ - public function testReplacesLogger() - { - $log1 = new Logger('test1'); - $log2 = new Logger('test2'); - - Registry::addLogger($log1, 'log'); - - Registry::addLogger($log2, 'log', true); - - $this->assertSame($log2, Registry::getInstance('log')); - } - - /** - * @expectedException \InvalidArgumentException - * @covers Monolog\Registry::addLogger - */ - public function testFailsOnUnspecifiedReplacement() - { - $log1 = new Logger('test1'); - $log2 = new Logger('test2'); - - Registry::addLogger($log1, 'log'); - - Registry::addLogger($log2, 'log'); - } -} diff --git a/vendor/monolog/monolog/tests/Monolog/SignalHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/SignalHandlerTest.php deleted file mode 100644 index 9fa0792..0000000 --- a/vendor/monolog/monolog/tests/Monolog/SignalHandlerTest.php +++ /dev/null @@ -1,287 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog; - -use Monolog\Handler\StreamHandler; -use Monolog\Handler\TestHandler; -use Psr\Log\LogLevel; - -/** - * @author Robert Gust-Bardon - * @covers Monolog\SignalHandler - */ -class SignalHandlerTest extends TestCase -{ - - private $asyncSignalHandling; - private $blockedSignals; - private $signalHandlers; - - protected function setUp() - { - $this->signalHandlers = array(); - if (extension_loaded('pcntl')) { - if (function_exists('pcntl_async_signals')) { - $this->asyncSignalHandling = pcntl_async_signals(); - } - if (function_exists('pcntl_sigprocmask')) { - pcntl_sigprocmask(SIG_BLOCK, array(), $this->blockedSignals); - } - } - } - - protected function tearDown() - { - if ($this->asyncSignalHandling !== null) { - pcntl_async_signals($this->asyncSignalHandling); - } - if ($this->blockedSignals !== null) { - pcntl_sigprocmask(SIG_SETMASK, $this->blockedSignals); - } - if ($this->signalHandlers) { - pcntl_signal_dispatch(); - foreach ($this->signalHandlers as $signo => $handler) { - pcntl_signal($signo, $handler); - } - } - } - - private function setSignalHandler($signo, $handler = SIG_DFL) { - if (function_exists('pcntl_signal_get_handler')) { - $this->signalHandlers[$signo] = pcntl_signal_get_handler($signo); - } else { - $this->signalHandlers[$signo] = SIG_DFL; - } - $this->assertTrue(pcntl_signal($signo, $handler)); - } - - public function testHandleSignal() - { - $logger = new Logger('test', array($handler = new TestHandler)); - $errHandler = new SignalHandler($logger); - $signo = 2; // SIGINT. - $siginfo = array('signo' => $signo, 'errno' => 0, 'code' => 0); - $errHandler->handleSignal($signo, $siginfo); - $this->assertCount(1, $handler->getRecords()); - $this->assertTrue($handler->hasCriticalRecords()); - $records = $handler->getRecords(); - $this->assertSame($siginfo, $records[0]['context']); - } - - /** - * @depends testHandleSignal - * @requires extension pcntl - * @requires extension posix - * @requires function pcntl_signal - * @requires function pcntl_signal_dispatch - * @requires function posix_getpid - * @requires function posix_kill - */ - public function testRegisterSignalHandler() - { - // SIGCONT and SIGURG should be ignored by default. - if (!defined('SIGCONT') || !defined('SIGURG')) { - $this->markTestSkipped('This test requires the SIGCONT and SIGURG pcntl constants.'); - } - - $this->setSignalHandler(SIGCONT, SIG_IGN); - $this->setSignalHandler(SIGURG, SIG_IGN); - - $logger = new Logger('test', array($handler = new TestHandler)); - $errHandler = new SignalHandler($logger); - $pid = posix_getpid(); - - $this->assertTrue(posix_kill($pid, SIGURG)); - $this->assertTrue(pcntl_signal_dispatch()); - $this->assertCount(0, $handler->getRecords()); - - $errHandler->registerSignalHandler(SIGURG, LogLevel::INFO, false, false, false); - - $this->assertTrue(posix_kill($pid, SIGCONT)); - $this->assertTrue(pcntl_signal_dispatch()); - $this->assertCount(0, $handler->getRecords()); - - $this->assertTrue(posix_kill($pid, SIGURG)); - $this->assertTrue(pcntl_signal_dispatch()); - $this->assertCount(1, $handler->getRecords()); - $this->assertTrue($handler->hasInfoThatContains('SIGURG')); - } - - /** - * @dataProvider defaultPreviousProvider - * @depends testRegisterSignalHandler - * @requires function pcntl_fork - * @requires function pcntl_sigprocmask - * @requires function pcntl_waitpid - */ - public function testRegisterDefaultPreviousSignalHandler($signo, $callPrevious, $expected) - { - $this->setSignalHandler($signo, SIG_DFL); - - $path = tempnam(sys_get_temp_dir(), 'monolog-'); - $this->assertNotFalse($path); - - $pid = pcntl_fork(); - if ($pid === 0) { // Child. - $streamHandler = new StreamHandler($path); - $streamHandler->setFormatter($this->getIdentityFormatter()); - $logger = new Logger('test', array($streamHandler)); - $errHandler = new SignalHandler($logger); - $errHandler->registerSignalHandler($signo, LogLevel::INFO, $callPrevious, false, false); - pcntl_sigprocmask(SIG_SETMASK, array(SIGCONT)); - posix_kill(posix_getpid(), $signo); - pcntl_signal_dispatch(); - // If $callPrevious is true, SIGINT should terminate by this line. - pcntl_sigprocmask(SIG_BLOCK, array(), $oldset); - file_put_contents($path, implode(' ', $oldset), FILE_APPEND); - posix_kill(posix_getpid(), $signo); - pcntl_signal_dispatch(); - exit(); - } - - $this->assertNotSame(-1, $pid); - $this->assertNotSame(-1, pcntl_waitpid($pid, $status)); - $this->assertNotSame(-1, $status); - $this->assertSame($expected, file_get_contents($path)); - } - - public function defaultPreviousProvider() - { - if (!defined('SIGCONT') || !defined('SIGINT') || !defined('SIGURG')) { - return array(); - } - - return array( - array(SIGINT, false, 'Program received signal SIGINT'.SIGCONT.'Program received signal SIGINT'), - array(SIGINT, true, 'Program received signal SIGINT'), - array(SIGURG, false, 'Program received signal SIGURG'.SIGCONT.'Program received signal SIGURG'), - array(SIGURG, true, 'Program received signal SIGURG'.SIGCONT.'Program received signal SIGURG'), - ); - } - - /** - * @dataProvider callablePreviousProvider - * @depends testRegisterSignalHandler - * @requires function pcntl_signal_get_handler - */ - public function testRegisterCallablePreviousSignalHandler($callPrevious) - { - $this->setSignalHandler(SIGURG, SIG_IGN); - - $logger = new Logger('test', array($handler = new TestHandler)); - $errHandler = new SignalHandler($logger); - $previousCalled = 0; - pcntl_signal(SIGURG, function ($signo, array $siginfo = null) use (&$previousCalled) { - ++$previousCalled; - }); - $errHandler->registerSignalHandler(SIGURG, LogLevel::INFO, $callPrevious, false, false); - $this->assertTrue(posix_kill(posix_getpid(), SIGURG)); - $this->assertTrue(pcntl_signal_dispatch()); - $this->assertCount(1, $handler->getRecords()); - $this->assertTrue($handler->hasInfoThatContains('SIGURG')); - $this->assertSame($callPrevious ? 1 : 0, $previousCalled); - } - - public function callablePreviousProvider() - { - return array( - array(false), - array(true), - ); - } - - /** - * @dataProvider restartSyscallsProvider - * @depends testRegisterDefaultPreviousSignalHandler - * @requires function pcntl_fork - * @requires function pcntl_waitpid - */ - public function testRegisterSyscallRestartingSignalHandler($restartSyscalls) - { - $this->setSignalHandler(SIGURG, SIG_IGN); - - $parentPid = posix_getpid(); - $microtime = microtime(true); - - $pid = pcntl_fork(); - if ($pid === 0) { // Child. - usleep(100000); - posix_kill($parentPid, SIGURG); - usleep(100000); - exit(); - } - - $this->assertNotSame(-1, $pid); - $logger = new Logger('test', array($handler = new TestHandler)); - $errHandler = new SignalHandler($logger); - $errHandler->registerSignalHandler(SIGURG, LogLevel::INFO, false, $restartSyscalls, false); - if ($restartSyscalls) { - // pcntl_wait is expected to be restarted after the signal handler. - $this->assertNotSame(-1, pcntl_waitpid($pid, $status)); - } else { - // pcntl_wait is expected to be interrupted when the signal handler is invoked. - $this->assertSame(-1, pcntl_waitpid($pid, $status)); - } - $this->assertSame($restartSyscalls, microtime(true) - $microtime > 0.15); - $this->assertTrue(pcntl_signal_dispatch()); - $this->assertCount(1, $handler->getRecords()); - if ($restartSyscalls) { - // The child has already exited. - $this->assertSame(-1, pcntl_waitpid($pid, $status)); - } else { - // The child has not exited yet. - $this->assertNotSame(-1, pcntl_waitpid($pid, $status)); - } - } - - public function restartSyscallsProvider() - { - return array( - array(false), - array(true), - array(false), - array(true), - ); - } - - /** - * @dataProvider asyncProvider - * @depends testRegisterDefaultPreviousSignalHandler - * @requires function pcntl_async_signals - */ - public function testRegisterAsyncSignalHandler($initialAsync, $desiredAsync, $expectedBefore, $expectedAfter) - { - $this->setSignalHandler(SIGURG, SIG_IGN); - pcntl_async_signals($initialAsync); - - $logger = new Logger('test', array($handler = new TestHandler)); - $errHandler = new SignalHandler($logger); - $errHandler->registerSignalHandler(SIGURG, LogLevel::INFO, false, false, $desiredAsync); - $this->assertTrue(posix_kill(posix_getpid(), SIGURG)); - $this->assertCount($expectedBefore, $handler->getRecords()); - $this->assertTrue(pcntl_signal_dispatch()); - $this->assertCount($expectedAfter, $handler->getRecords()); - } - - public function asyncProvider() - { - return array( - array(false, false, 0, 1), - array(false, null, 0, 1), - array(false, true, 1, 1), - array(true, false, 0, 1), - array(true, null, 1, 1), - array(true, true, 1, 1), - ); - } - -} diff --git a/vendor/phpseclib/phpseclib/BACKERS.md b/vendor/phpseclib/phpseclib/BACKERS.md new file mode 100644 index 0000000..e9f3784 --- /dev/null +++ b/vendor/phpseclib/phpseclib/BACKERS.md @@ -0,0 +1,7 @@ +# Backers + +phpseclib ongoing development is made possible by [Tidelift](https://tidelift.com/subscription/pkg/packagist-phpseclib-phpseclib?utm_source=packagist-phpseclib-phpseclib&utm_medium=referral&utm_campaign=readme) and by contributions by users like you. Thank you. + +## Backers + +- Zane Hooper \ No newline at end of file diff --git a/vendor/phpseclib/phpseclib/README.md b/vendor/phpseclib/phpseclib/README.md index a9e7ebd..ce201c9 100644 --- a/vendor/phpseclib/phpseclib/README.md +++ b/vendor/phpseclib/phpseclib/README.md @@ -45,7 +45,7 @@ AES, Blowfish, Twofish, SSH-1, SSH-2, SFTP, and X.509 * Composer compatible (PSR-0 autoloading) * Install using Composer: `composer require phpseclib/phpseclib:~1.0` * Install using PEAR: See [phpseclib PEAR Channel Documentation](http://phpseclib.sourceforge.net/pear.htm) -* [Download 1.0.16 as ZIP](http://sourceforge.net/projects/phpseclib/files/phpseclib1.0.16.zip/download) +* [Download 1.0.17 as ZIP](http://sourceforge.net/projects/phpseclib/files/phpseclib1.0.17.zip/download) ## Security contact information diff --git a/vendor/phpseclib/phpseclib/phpseclib/File/ASN1.php b/vendor/phpseclib/phpseclib/phpseclib/File/ASN1.php index 3aaa309..3b8f11b 100644 --- a/vendor/phpseclib/phpseclib/phpseclib/File/ASN1.php +++ b/vendor/phpseclib/phpseclib/phpseclib/File/ASN1.php @@ -702,7 +702,14 @@ class ASN1 return isset($this->oids[$decoded['content']]) ? $this->oids[$decoded['content']] : $decoded['content']; case self::TYPE_UTC_TIME: case self::TYPE_GENERALIZED_TIME: - if (isset($mapping['implicit'])) { + // for explicitly tagged optional stuff + if (is_array($decoded['content'])) { + $decoded['content'] = $decoded['content'][0]['content']; + } + // for implicitly tagged optional stuff + // in theory, doing isset($mapping['implicit']) would work but malformed certs do exist + // in the wild that OpenSSL decodes without issue so we'll support them as well + if (!is_object($decoded['content'])) { $decoded['content'] = $this->_decodeTime($decoded['content'], $decoded['type']); } return $decoded['content'] ? $decoded['content']->format($this->format) : false; @@ -843,7 +850,7 @@ class ASN1 if ($mapping['type'] == self::TYPE_SET) { sort($value); } - $value = implode($value, ''); + $value = implode('', $value); break; } diff --git a/vendor/phpseclib/phpseclib/phpseclib/File/X509.php b/vendor/phpseclib/phpseclib/phpseclib/File/X509.php index 4ebafa1..b4963fc 100644 --- a/vendor/phpseclib/phpseclib/phpseclib/File/X509.php +++ b/vendor/phpseclib/phpseclib/phpseclib/File/X509.php @@ -963,6 +963,13 @@ class X509 'children' => $AccessDescription ); + $this->SubjectInfoAccessSyntax = array( + 'type' => ASN1::TYPE_SEQUENCE, + 'min' => 1, + 'max' => -1, + 'children' => $AccessDescription + ); + $this->SubjectAltName = $GeneralNames; $this->PrivateKeyUsagePeriod = array( @@ -1620,7 +1627,10 @@ class X509 corresponding to the extension type identified by extnID */ $map = $this->_getMapping($id); if (!is_bool($map)) { - $mapped = $asn1->asn1map($decoded[0], $map, array('iPAddress' => array($this, '_decodeIP'))); + $decoder = $id == 'id-ce-nameConstraints' ? + array($this, '_decodeNameConstraintIP') : + array($this, '_decodeIP'); + $mapped = $asn1->asn1map($decoded[0], $map, array('iPAddress' => $decoder)); $value = $mapped === false ? $decoded[0] : $mapped; if ($id == 'id-ce-certificatePolicies') { @@ -1889,6 +1899,8 @@ class X509 return $this->ExtKeyUsageSyntax; case 'id-pe-authorityInfoAccess': return $this->AuthorityInfoAccessSyntax; + case 'id-pe-subjectInfoAccess': + return $this->SubjectInfoAccessSyntax; case 'id-ce-subjectAltName': return $this->SubjectAltName; case 'id-ce-subjectDirectoryAttributes': @@ -2511,18 +2523,38 @@ class X509 return inet_ntop(base64_decode($ip)); } + /** + * Decodes an IP address in a name constraints extension + * + * Takes in a base64 encoded "blob" and returns a human readable IP address / mask + * + * @param string $ip + * @access private + * @return array + */ + function _decodeNameConstraintIP($ip) + { + $ip = base64_decode($ip); + $size = strlen($ip) >> 1; + $mask = substr($ip, $size); + $ip = substr($ip, 0, $size); + return array(inet_ntop($ip), inet_ntop($mask)); + } + /** * Encodes an IP address * * Takes a human readable IP address into a base64-encoded "blob" * - * @param string $ip + * @param string|array $ip * @access private * @return string */ function _encodeIP($ip) { - return base64_encode(inet_pton($ip)); + return is_string($ip) ? + base64_encode(inet_pton($ip)) : + base64_encode(inet_pton($ip[0]) . inet_pton($ip[1])); } /** diff --git a/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger.php b/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger.php index fe1f43c..e7f6646 100644 --- a/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger.php +++ b/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger.php @@ -545,7 +545,7 @@ class BigInteger $bytes = chr(0); } - if (ord($bytes[0]) & 0x80) { + if ($this->precision <= 0 && (ord($bytes[0]) & 0x80)) { $bytes = chr(0) . $bytes; } @@ -707,6 +707,7 @@ class BigInteger } $temp = $this->copy(); + $temp->bitmask = false; $temp->is_negative = false; $divisor = new static(); @@ -843,7 +844,7 @@ class BigInteger $opts[] = 'OpenSSL'; } if (!empty($opts)) { - $engine.= ' (' . implode($opts, ', ') . ')'; + $engine.= ' (' . implode('.', $opts) . ')'; } return array( 'value' => '0x' . $this->toHex(true), @@ -3569,7 +3570,14 @@ class BigInteger switch (MATH_BIGINTEGER_MODE) { case self::MODE_GMP: if ($this->bitmask !== false) { + $flip = gmp_cmp($result->value, gmp_init(0)) < 0; + if ($flip) { + $result->value = gmp_neg($result->value); + } $result->value = gmp_and($result->value, $result->bitmask->value); + if ($flip) { + $result->value = gmp_neg($result->value); + } } return $result; diff --git a/vendor/phpseclib/phpseclib/phpseclib/Net/SFTP.php b/vendor/phpseclib/phpseclib/phpseclib/Net/SFTP.php index a248c25..074b4f7 100644 --- a/vendor/phpseclib/phpseclib/phpseclib/Net/SFTP.php +++ b/vendor/phpseclib/phpseclib/phpseclib/Net/SFTP.php @@ -410,6 +410,7 @@ class SFTP extends SSH2 function login($username) { $args = func_get_args(); + $this->auth[] = $args; if (!call_user_func_array(array(&$this, '_login'), $args)) { return false; } @@ -2975,6 +2976,20 @@ class SFTP extends SSH2 return $result; } + /** + * Resets a connection for re-use + * + * @param int $reason + * @access private + */ + function _reset_connection($reason) + { + parent::_reset_connection($reason); + $this->use_request_id = false; + $this->pwd = false; + $this->requestBuffer = array(); + } + /** * Receives SFTP Packets * diff --git a/vendor/phpseclib/phpseclib/phpseclib/Net/SSH2.php b/vendor/phpseclib/phpseclib/phpseclib/Net/SSH2.php index 817fa16..1c634f1 100644 --- a/vendor/phpseclib/phpseclib/phpseclib/Net/SSH2.php +++ b/vendor/phpseclib/phpseclib/phpseclib/Net/SSH2.php @@ -209,6 +209,15 @@ class SSH2 */ var $kex_algorithms = false; + /** + * Key Exchange Algorithm + * + * @see self::getMethodsNegotiated() + * @var string|false + * @access private + */ + var $kex_algorithm = false; + /** * Minimum Diffie-Hellman Group Bit Size in RFC 4419 Key Exchange Methods * @@ -317,6 +326,15 @@ class SSH2 */ var $languages_client_to_server = false; + /** + * Preferred Algorithms + * + * @see self::setPreferredAlgorithms() + * @var array + * @access private + */ + var $preferred = array(); + /** * Block Size for Server to Client Encryption * @@ -898,14 +916,6 @@ class SSH2 */ var $bad_key_size_fix = false; - /** - * The selected decryption algorithm - * - * @var string - * @access private - */ - var $decrypt_algorithm = ''; - /** * Should we try to re-connect to re-establish keys? * @@ -1280,7 +1290,7 @@ class SSH2 $identifier = 'SSH-2.0-phpseclib_2.0'; $ext = array(); - if (function_exists('\\Sodium\\library_version_major')) { + if (function_exists('sodium_crypto_box_publickey_from_secretkey')) { $ext[] = 'libsodium'; } @@ -1311,141 +1321,59 @@ class SSH2 */ function _key_exchange($kexinit_payload_server = false) { - $kex_algorithms = array( - // Elliptic Curve Diffie-Hellman Key Agreement (ECDH) using - // Curve25519. See doc/curve25519-sha256@libssh.org.txt in the - // libssh repository for more information. - 'curve25519-sha256@libssh.org', + $preferred = $this->preferred; - // Diffie-Hellman Key Agreement (DH) using integer modulo prime - // groups. - 'diffie-hellman-group1-sha1', // REQUIRED - 'diffie-hellman-group14-sha1', // REQUIRED - 'diffie-hellman-group-exchange-sha1', // RFC 4419 - 'diffie-hellman-group-exchange-sha256', // RFC 4419 - ); - if (!function_exists('\\Sodium\\library_version_major')) { - $kex_algorithms = array_diff( - $kex_algorithms, - array('curve25519-sha256@libssh.org') - ); - } - - $server_host_key_algorithms = array( - 'rsa-sha2-256', // RFC 8332 - 'rsa-sha2-512', // RFC 8332 - 'ssh-rsa', // RECOMMENDED sign Raw RSA Key - 'ssh-dss' // REQUIRED sign Raw DSS Key - ); - - $encryption_algorithms = array( - // from : - 'arcfour256', - 'arcfour128', - - //'arcfour', // OPTIONAL the ARCFOUR stream cipher with a 128-bit key - - // CTR modes from : - 'aes128-ctr', // RECOMMENDED AES (Rijndael) in SDCTR mode, with 128-bit key - 'aes192-ctr', // RECOMMENDED AES with 192-bit key - 'aes256-ctr', // RECOMMENDED AES with 256-bit key - - 'twofish128-ctr', // OPTIONAL Twofish in SDCTR mode, with 128-bit key - 'twofish192-ctr', // OPTIONAL Twofish with 192-bit key - 'twofish256-ctr', // OPTIONAL Twofish with 256-bit key - - 'aes128-cbc', // RECOMMENDED AES with a 128-bit key - 'aes192-cbc', // OPTIONAL AES with a 192-bit key - 'aes256-cbc', // OPTIONAL AES in CBC mode, with a 256-bit key - - 'twofish128-cbc', // OPTIONAL Twofish with a 128-bit key - 'twofish192-cbc', // OPTIONAL Twofish with a 192-bit key - 'twofish256-cbc', - 'twofish-cbc', // OPTIONAL alias for "twofish256-cbc" - // (this is being retained for historical reasons) - - 'blowfish-ctr', // OPTIONAL Blowfish in SDCTR mode - - 'blowfish-cbc', // OPTIONAL Blowfish in CBC mode - - '3des-ctr', // RECOMMENDED Three-key 3DES in SDCTR mode - - '3des-cbc', // REQUIRED three-key 3DES in CBC mode - //'none' // OPTIONAL no encryption; NOT RECOMMENDED - ); - - if (extension_loaded('openssl') && !extension_loaded('mcrypt')) { - // OpenSSL does not support arcfour256 in any capacity and arcfour128 / arcfour support is limited to - // instances that do not use continuous buffers - $encryption_algorithms = array_diff( - $encryption_algorithms, - array('arcfour256', 'arcfour128', 'arcfour') - ); - } - - if (class_exists('\phpseclib\Crypt\RC4') === false) { - $encryption_algorithms = array_diff( - $encryption_algorithms, - array('arcfour256', 'arcfour128', 'arcfour') - ); - } - if (class_exists('\phpseclib\Crypt\Rijndael') === false) { - $encryption_algorithms = array_diff( - $encryption_algorithms, - array('aes128-ctr', 'aes192-ctr', 'aes256-ctr', 'aes128-cbc', 'aes192-cbc', 'aes256-cbc') - ); - } - if (class_exists('\phpseclib\Crypt\Twofish') === false) { - $encryption_algorithms = array_diff( - $encryption_algorithms, - array('twofish128-ctr', 'twofish192-ctr', 'twofish256-ctr', 'twofish128-cbc', 'twofish192-cbc', 'twofish256-cbc', 'twofish-cbc') - ); - } - if (class_exists('\phpseclib\Crypt\Blowfish') === false) { - $encryption_algorithms = array_diff( - $encryption_algorithms, - array('blowfish-ctr', 'blowfish-cbc') - ); - } - if (class_exists('\phpseclib\Crypt\TripleDES') === false) { - $encryption_algorithms = array_diff( - $encryption_algorithms, - array('3des-ctr', '3des-cbc') - ); - } - $encryption_algorithms = array_values($encryption_algorithms); - - $mac_algorithms = array( - // from : - 'hmac-sha2-256',// RECOMMENDED HMAC-SHA256 (digest length = key length = 32) - - 'hmac-sha1-96', // RECOMMENDED first 96 bits of HMAC-SHA1 (digest length = 12, key length = 20) - 'hmac-sha1', // REQUIRED HMAC-SHA1 (digest length = key length = 20) - 'hmac-md5-96', // OPTIONAL first 96 bits of HMAC-MD5 (digest length = 12, key length = 16) - 'hmac-md5', // OPTIONAL HMAC-MD5 (digest length = key length = 16) - //'none' // OPTIONAL no MAC; NOT RECOMMENDED - ); - - $compression_algorithms = array( - 'none' // REQUIRED no compression - //'zlib' // OPTIONAL ZLIB (LZ77) compression - ); + $kex_algorithms = isset($preferred['kex']) ? + $preferred['kex'] : + $this->getSupportedKEXAlgorithms(); + $server_host_key_algorithms = isset($preferred['hostkey']) ? + $preferred['hostkey'] : + $this->getSupportedHostKeyAlgorithms(); + $s2c_encryption_algorithms = isset($preferred['server_to_client']['crypt']) ? + $preferred['server_to_client']['crypt'] : + $this->getSupportedEncryptionAlgorithms(); + $c2s_encryption_algorithms = isset($preferred['client_to_server']['crypt']) ? + $preferred['client_to_server']['crypt'] : + $this->getSupportedEncryptionAlgorithms(); + $s2c_mac_algorithms = isset($preferred['server_to_client']['mac']) ? + $preferred['server_to_client']['mac'] : + $this->getSupportedMACAlgorithms(); + $c2s_mac_algorithms = isset($preferred['client_to_server']['mac']) ? + $preferred['client_to_server']['mac'] : + $this->getSupportedMACAlgorithms(); + $s2c_compression_algorithms = isset($preferred['server_to_client']['comp']) ? + $preferred['server_to_client']['comp'] : + $this->getSupportedCompressionAlgorithms(); + $c2s_compression_algorithms = isset($preferred['client_to_server']['comp']) ? + $preferred['client_to_server']['comp'] : + $this->getSupportedCompressionAlgorithms(); // some SSH servers have buggy implementations of some of the above algorithms switch (true) { case $this->server_identifier == 'SSH-2.0-SSHD': case substr($this->server_identifier, 0, 13) == 'SSH-2.0-DLINK': - $mac_algorithms = array_values(array_diff( - $mac_algorithms, - array('hmac-sha1-96', 'hmac-md5-96') - )); + if (!isset($preferred['server_to_client']['mac'])) { + $s2c_mac_algorithms = array_values(array_diff( + $s2c_mac_algorithms, + array('hmac-sha1-96', 'hmac-md5-96') + )); + } + if (!isset($preferred['client_to_server']['mac'])) { + $c2s_mac_algorithms = array_values(array_diff( + $c2s_mac_algorithms, + array('hmac-sha1-96', 'hmac-md5-96') + )); + } } $str_kex_algorithms = implode(',', $kex_algorithms); $str_server_host_key_algorithms = implode(',', $server_host_key_algorithms); - $encryption_algorithms_server_to_client = $encryption_algorithms_client_to_server = implode(',', $encryption_algorithms); - $mac_algorithms_server_to_client = $mac_algorithms_client_to_server = implode(',', $mac_algorithms); - $compression_algorithms_server_to_client = $compression_algorithms_client_to_server = implode(',', $compression_algorithms); + $encryption_algorithms_server_to_client = implode(',', $s2c_encryption_algorithms); + $encryption_algorithms_client_to_server = implode(',', $c2s_encryption_algorithms); + $mac_algorithms_server_to_client = implode(',', $s2c_mac_algorithms); + $mac_algorithms_client_to_server = implode(',', $c2s_mac_algorithms); + $compression_algorithms_server_to_client = implode(',', $s2c_compression_algorithms); + $compression_algorithms_client_to_server = implode(',', $c2s_compression_algorithms); $client_cookie = Random::string(16); @@ -1572,14 +1500,14 @@ class SSH2 // we need to decide upon the symmetric encryption algorithms before we do the diffie-hellman key exchange // we don't initialize any crypto-objects, yet - we do that, later. for now, we need the lengths to make the // diffie-hellman key exchange as fast as possible - $decrypt = $this->_array_intersect_first($encryption_algorithms, $this->encryption_algorithms_server_to_client); + $decrypt = $this->_array_intersect_first($s2c_encryption_algorithms, $this->encryption_algorithms_server_to_client); $decryptKeyLength = $this->_encryption_algorithm_to_key_size($decrypt); if ($decryptKeyLength === null) { user_error('No compatible server to client encryption algorithms found'); return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED); } - $encrypt = $this->_array_intersect_first($encryption_algorithms, $this->encryption_algorithms_client_to_server); + $encrypt = $this->_array_intersect_first($c2s_encryption_algorithms, $this->encryption_algorithms_client_to_server); $encryptKeyLength = $this->_encryption_algorithm_to_key_size($encrypt); if ($encryptKeyLength === null) { user_error('No compatible client to server encryption algorithms found'); @@ -1587,7 +1515,7 @@ class SSH2 } // through diffie-hellman key exchange a symmetric key is obtained - $kex_algorithm = $this->_array_intersect_first($kex_algorithms, $this->kex_algorithms); + $this->kex_algorithm = $kex_algorithm = $this->_array_intersect_first($kex_algorithms, $this->kex_algorithms); if ($kex_algorithm === false) { user_error('No compatible key exchange algorithms found'); return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED); @@ -1598,7 +1526,7 @@ class SSH2 if ($kex_algorithm === 'curve25519-sha256@libssh.org') { $x = Random::string(32); - $eBytes = \Sodium\crypto_box_publickey_from_secretkey($x); + $eBytes = sodium_crypto_box_publickey_from_secretkey($x); $clientKexInitMessage = NET_SSH2_MSG_KEX_ECDH_INIT; $serverKexReplyMessage = NET_SSH2_MSG_KEX_ECDH_REPLY; $kexHash = new Hash('sha256'); @@ -1770,8 +1698,8 @@ class SSH2 user_error('Received curve25519 public key of invalid length.'); return false; } - $key = new BigInteger(\Sodium\crypto_scalarmult($x, $fBytes), 256); - \Sodium\memzero($x); + $key = new BigInteger(sodium_crypto_scalarmult($x, $fBytes), 256); + sodium_memzero($x); } else { $f = new BigInteger($fBytes, -256); $key = $f->modPow($x, $prime); @@ -1859,8 +1787,6 @@ class SSH2 return false; } - $this->decrypt_algorithm = $decrypt; - $keyBytes = pack('Na*', strlen($keyBytes), $keyBytes); $this->encrypt = $this->_encryption_algorithm_to_crypt_instance($encrypt); @@ -1874,6 +1800,10 @@ class SSH2 $this->encrypt->enableContinuousBuffer(); $this->encrypt->disablePadding(); + if ($this->encrypt->getBlockLength()) { + $this->encrypt_block_size = $this->encrypt->getBlockLength() >> 3; + } + $iv = $kexHash->hash($keyBytes . $this->exchange_hash . 'A' . $this->session_id); while ($this->encrypt_block_size > strlen($iv)) { $iv.= $kexHash->hash($keyBytes . $this->exchange_hash . $iv); @@ -1885,6 +1815,8 @@ class SSH2 $key.= $kexHash->hash($keyBytes . $this->exchange_hash . $key); } $this->encrypt->setKey(substr($key, 0, $encryptKeyLength)); + + $this->encrypt->name = $decrypt; } $this->decrypt = $this->_encryption_algorithm_to_crypt_instance($decrypt); @@ -1898,6 +1830,10 @@ class SSH2 $this->decrypt->enableContinuousBuffer(); $this->decrypt->disablePadding(); + if ($this->decrypt->getBlockLength()) { + $this->decrypt_block_size = $this->decrypt->getBlockLength() >> 3; + } + $iv = $kexHash->hash($keyBytes . $this->exchange_hash . 'B' . $this->session_id); while ($this->decrypt_block_size > strlen($iv)) { $iv.= $kexHash->hash($keyBytes . $this->exchange_hash . $iv); @@ -1909,6 +1845,8 @@ class SSH2 $key.= $kexHash->hash($keyBytes . $this->exchange_hash . $key); } $this->decrypt->setKey(substr($key, 0, $decryptKeyLength)); + + $this->decrypt->name = $decrypt; } /* The "arcfour128" algorithm is the RC4 cipher, as described in @@ -1925,7 +1863,7 @@ class SSH2 $this->decrypt->decrypt(str_repeat("\0", 1536)); } - $mac_algorithm = $this->_array_intersect_first($mac_algorithms, $this->mac_algorithms_client_to_server); + $mac_algorithm = $this->_array_intersect_first($c2s_mac_algorithms, $this->mac_algorithms_client_to_server); if ($mac_algorithm === false) { user_error('No compatible client to server message authentication algorithms found'); return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED); @@ -1953,8 +1891,9 @@ class SSH2 $this->hmac_create = new Hash('md5-96'); $createKeyLength = 16; } + $this->hmac_create->name = $mac_algorithm; - $mac_algorithm = $this->_array_intersect_first($mac_algorithms, $this->mac_algorithms_server_to_client); + $mac_algorithm = $this->_array_intersect_first($s2c_mac_algorithms, $this->mac_algorithms_server_to_client); if ($mac_algorithm === false) { user_error('No compatible server to client message authentication algorithms found'); return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED); @@ -1988,6 +1927,7 @@ class SSH2 $checkKeyLength = 16; $this->hmac_size = 12; } + $this->hmac_check->name = $mac_algorithm; $key = $kexHash->hash($keyBytes . $this->exchange_hash . 'E' . $this->session_id); while ($createKeyLength > strlen($key)) { @@ -2001,19 +1941,19 @@ class SSH2 } $this->hmac_check->setKey(substr($key, 0, $checkKeyLength)); - $compression_algorithm = $this->_array_intersect_first($compression_algorithms, $this->compression_algorithms_server_to_client); - if ($compression_algorithm === false) { - user_error('No compatible server to client compression algorithms found'); - return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED); - } - $this->decompress = $compression_algorithm == 'zlib'; - - $compression_algorithm = $this->_array_intersect_first($compression_algorithms, $this->compression_algorithms_client_to_server); + $compression_algorithm = $this->_array_intersect_first($c2s_compression_algorithms, $this->compression_algorithms_client_to_server); if ($compression_algorithm === false) { user_error('No compatible client to server compression algorithms found'); return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED); } - $this->compress = $compression_algorithm == 'zlib'; + //$this->decompress = $compression_algorithm == 'zlib'; + + $compression_algorithm = $this->_array_intersect_first($s2c_compression_algorithms, $this->compression_algorithms_client_to_server); + if ($compression_algorithm === false) { + user_error('No compatible server to client compression algorithms found'); + return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED); + } + //$this->compress = $compression_algorithm == 'zlib'; return true; } @@ -2105,7 +2045,7 @@ class SSH2 return null; } - /* + /** * Tests whether or not proposed algorithm has a potential for issues * * @link https://www.chiark.greenend.org.uk/~sgtatham/putty/wishlist/ssh2-aesctr-openssh.html @@ -3266,6 +3206,9 @@ class SSH2 function ping() { if (!$this->isAuthenticated()) { + if (!empty($this->auth)) { + return $this->_reconnect(); + } return false; } @@ -3376,7 +3319,7 @@ class SSH2 // "implementations SHOULD check that the packet length is reasonable" // PuTTY uses 0x9000 as the actual max packet size and so to shall we if ($remaining_length < -$this->decrypt_block_size || $remaining_length > 0x9000 || $remaining_length % $this->decrypt_block_size != 0) { - if (!$this->bad_key_size_fix && $this->_bad_algorithm_candidate($this->decrypt_algorithm) && !($this->bitmap & SSH2::MASK_LOGIN)) { + if (!$this->bad_key_size_fix && $this->_bad_algorithm_candidate($this->decrypt->name) && !($this->bitmap & SSH2::MASK_LOGIN)) { $this->bad_key_size_fix = true; $this->_reset_connection(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED); return false; @@ -4173,10 +4116,14 @@ class SSH2 if ($this->bitmap & self::MASK_CONNECTED) { $data = pack('CNNa*Na*', NET_SSH2_MSG_DISCONNECT, $reason, 0, '', 0, ''); $this->_send_binary_packet($data); - $this->bitmap = 0; - fclose($this->fsock); - return false; } + + $this->bitmap = 0; + if (is_resource($this->fsock) && get_resource_type($this->fsock) == 'stream') { + fclose($this->fsock); + } + + return false; } /** @@ -4497,6 +4444,309 @@ class SSH2 return $this->languages_client_to_server; } + /** + * Returns a list of algorithms the server supports + * + * @return array + * @access public + */ + public function getServerAlgorithms() + { + $this->_connect(); + + return array( + 'kex' => $this->kex_algorithms, + 'hostkey' => $this->server_host_key_algorithms, + 'client_to_server' => array( + 'crypt' => $this->encryption_algorithms_client_to_server, + 'mac' => $this->mac_algorithms_client_to_server, + 'comp' => $this->compression_algorithms_client_to_server, + 'lang' => $this->languages_client_to_server + ), + 'server_to_client' => array( + 'crypt' => $this->encryption_algorithms_server_to_client, + 'mac' => $this->mac_algorithms_server_to_client, + 'comp' => $this->compression_algorithms_server_to_client, + 'lang' => $this->languages_server_to_client + ) + ); + } + + /** + * Returns a list of KEX algorithms that phpseclib supports + * + * @return array + * @access public + */ + function getSupportedKEXAlgorithms() + { + $kex_algorithms = array( + // Elliptic Curve Diffie-Hellman Key Agreement (ECDH) using + // Curve25519. See doc/curve25519-sha256@libssh.org.txt in the + // libssh repository for more information. + 'curve25519-sha256@libssh.org', + + 'diffie-hellman-group-exchange-sha256',// RFC 4419 + 'diffie-hellman-group-exchange-sha1', // RFC 4419 + + // Diffie-Hellman Key Agreement (DH) using integer modulo prime + // groups. + 'diffie-hellman-group14-sha1', // REQUIRED + 'diffie-hellman-group1-sha1', // REQUIRED + ); + + if (!function_exists('sodium_crypto_box_publickey_from_secretkey')) { + $kex_algorithms = array_diff( + $kex_algorithms, + array('curve25519-sha256@libssh.org') + ); + } + + return $kex_algorithms; + } + + /** + * Returns a list of host key algorithms that phpseclib supports + * + * @return array + * @access public + */ + function getSupportedHostKeyAlgorithms() + { + return array( + 'rsa-sha2-256', // RFC 8332 + 'rsa-sha2-512', // RFC 8332 + 'ssh-rsa', // RECOMMENDED sign Raw RSA Key + 'ssh-dss' // REQUIRED sign Raw DSS Key + ); + } + + /** + * Returns a list of symmetric key algorithms that phpseclib supports + * + * @return array + * @access public + */ + function getSupportedEncryptionAlgorithms() + { + $algos = array( + // from : + 'arcfour256', + 'arcfour128', + + //'arcfour', // OPTIONAL the ARCFOUR stream cipher with a 128-bit key + + // CTR modes from : + 'aes128-ctr', // RECOMMENDED AES (Rijndael) in SDCTR mode, with 128-bit key + 'aes192-ctr', // RECOMMENDED AES with 192-bit key + 'aes256-ctr', // RECOMMENDED AES with 256-bit key + + 'twofish128-ctr', // OPTIONAL Twofish in SDCTR mode, with 128-bit key + 'twofish192-ctr', // OPTIONAL Twofish with 192-bit key + 'twofish256-ctr', // OPTIONAL Twofish with 256-bit key + + 'aes128-cbc', // RECOMMENDED AES with a 128-bit key + 'aes192-cbc', // OPTIONAL AES with a 192-bit key + 'aes256-cbc', // OPTIONAL AES in CBC mode, with a 256-bit key + + 'twofish128-cbc', // OPTIONAL Twofish with a 128-bit key + 'twofish192-cbc', // OPTIONAL Twofish with a 192-bit key + 'twofish256-cbc', + 'twofish-cbc', // OPTIONAL alias for "twofish256-cbc" + // (this is being retained for historical reasons) + + 'blowfish-ctr', // OPTIONAL Blowfish in SDCTR mode + + 'blowfish-cbc', // OPTIONAL Blowfish in CBC mode + + '3des-ctr', // RECOMMENDED Three-key 3DES in SDCTR mode + + '3des-cbc', // REQUIRED three-key 3DES in CBC mode + + //'none' // OPTIONAL no encryption; NOT RECOMMENDED + ); + + $engines = array( + Base::ENGINE_OPENSSL, + Base::ENGINE_MCRYPT, + Base::ENGINE_INTERNAL + ); + + $ciphers = array(); + foreach ($engines as $engine) { + foreach ($algos as $algo) { + $obj = $this->_encryption_algorithm_to_crypt_instance($algo); + if ($obj instanceof Rijndael) { + $obj->setKeyLength(preg_replace('#[^\d]#', '', $algo)); + } + switch ($algo) { + case 'arcfour128': + case 'arcfour256': + if ($engine == Base::ENGINE_INTERNAL) { + $algos = array_diff($algos, array($algo)); + $ciphers[] = $algo; + } else { + continue 2; + } + } + if ($obj->isValidEngine($engine)) { + $algos = array_diff($algos, array($algo)); + $ciphers[] = $algo; + } + } + } + + return $ciphers; + } + + /** + * Returns a list of MAC algorithms that phpseclib supports + * + * @return array + * @access public + */ + function getSupportedMACAlgorithms() + { + return array( + // from : + 'hmac-sha2-256',// RECOMMENDED HMAC-SHA256 (digest length = key length = 32) + + 'hmac-sha1-96', // RECOMMENDED first 96 bits of HMAC-SHA1 (digest length = 12, key length = 20) + 'hmac-sha1', // REQUIRED HMAC-SHA1 (digest length = key length = 20) + 'hmac-md5-96', // OPTIONAL first 96 bits of HMAC-MD5 (digest length = 12, key length = 16) + 'hmac-md5', // OPTIONAL HMAC-MD5 (digest length = key length = 16) + //'none' // OPTIONAL no MAC; NOT RECOMMENDED + ); + } + + /** + * Returns a list of compression algorithms that phpseclib supports + * + * @return array + * @access public + */ + function getSupportedCompressionAlgorithms() + { + return array( + 'none' // REQUIRED no compression + //'zlib' // OPTIONAL ZLIB (LZ77) compression + ); + } + + /** + * Return list of negotiated algorithms + * + * Uses the same format as https://www.php.net/ssh2-methods-negotiated + * + * @return array + * @access public + */ + function getAlgorithmsNegotiated() + { + $this->_connect(); + + return array( + 'kex' => $this->kex_algorithm, + 'hostkey' => $this->signature_format, + 'client_to_server' => array( + 'crypt' => $this->encrypt->name, + 'mac' => $this->hmac_create->name, + 'comp' => 'none', + ), + 'server_to_client' => array( + 'crypt' => $this->decrypt->name, + 'mac' => $this->hmac_check->name, + 'comp' => 'none', + ) + ); + } + + /** + * Accepts an associative array with up to four parameters as described at + * + * + * @param array $methods + * @access public + */ + function setPreferredAlgorithms($methods) + { + $preferred = $methods; + + if (isset($preferred['kex'])) { + $preferred['kex'] = array_intersect( + $preferred['kex'], + $this->getSupportedKEXAlgorithms() + ); + } + + if (isset($preferred['hostkey'])) { + $preferred['hostkey'] = array_intersect( + $preferred['hostkey'], + $this->getSupportedHostKeyAlgorithms() + ); + } + + $keys = array('client_to_server', 'server_to_client'); + foreach ($keys as $key) { + if (isset($preferred[$key])) { + $a = &$preferred[$key]; + if (isset($a['crypt'])) { + $a['crypt'] = array_intersect( + $a['crypt'], + $this->getSupportedEncryptionAlgorithms() + ); + } + if (isset($a['comp'])) { + $a['comp'] = array_intersect( + $a['comp'], + $this->getSupportedCompressionAlgorithms() + ); + } + if (isset($a['mac'])) { + $a['mac'] = array_intersect( + $a['mac'], + $this->getSupportedMACAlgorithms() + ); + } + } + } + + $keys = array( + 'kex', + 'hostkey', + 'client_to_server/crypt', + 'client_to_server/comp', + 'client_to_server/mac', + 'server_to_client/crypt', + 'server_to_client/comp', + 'server_to_client/mac', + ); + foreach ($keys as $key) { + $p = $preferred; + $m = $methods; + + $subkeys = explode('/', $key); + foreach ($subkeys as $subkey) { + if (!isset($p[$subkey])) { + continue 2; + } + $p = $p[$subkey]; + $m = $m[$subkey]; + } + + if (count($p) != count($m)) { + $diff = array_diff($m, $p); + $msg = count($diff) == 1 ? + ' is not a supported algorithm' : + ' are not supported algorithms'; + user_error(implode(', ', $diff) . $msg); + return false; + } + } + + $this->preferred = $preferred; + } + /** * Returns the banner message. *