update composer dependencies
This commit is contained in:
2
vendor/google/apiclient/README.md
vendored
2
vendor/google/apiclient/README.md
vendored
@@ -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! ###
|
||||
|
||||
|
||||
2
vendor/google/apiclient/composer.json
vendored
2
vendor/google/apiclient/composer.json
vendored
@@ -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"
|
||||
|
||||
164
vendor/google/apiclient/phpcs.xml.dist
vendored
164
vendor/google/apiclient/phpcs.xml.dist
vendored
@@ -1,164 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<ruleset name="GAPI">
|
||||
<description>The Google API client library coding standard.</description>
|
||||
|
||||
<!-- PHP code MUST use the long <?php ?> tags or the short-echo <?= ?> tags; it MUST NOT use the other tag variations. -->
|
||||
<rule ref="Generic.PHP.DisallowShortOpenTag.EchoFound">
|
||||
<severity>0</severity>
|
||||
</rule>
|
||||
|
||||
<!-- PHP code MUST use only UTF-8 without BOM. -->
|
||||
<rule ref="Generic.Files.ByteOrderMark"/>
|
||||
|
||||
<!-- Check for cross-version support for PHP 5.4 and higher. -->
|
||||
<rule ref="PHPCompatibility">
|
||||
<config name="testVersion" value="5.4-"/>
|
||||
</rule>
|
||||
|
||||
<!-- Check for duplicated class names -->
|
||||
<rule ref="Generic.Classes.DuplicateClassName" />
|
||||
|
||||
<!-- Class constants MUST be declared in all upper case with underscore separators. -->
|
||||
<rule ref="Generic.NamingConventions.UpperCaseConstantName"/>
|
||||
|
||||
<!-- Method names MUST be declared in camelCase(). -->
|
||||
<rule ref="Generic.NamingConventions.CamelCapsFunctionName">
|
||||
<properties>
|
||||
<property name="strict" value="false"/>
|
||||
</properties>
|
||||
<!-- Generated libs have some properties that break this! -->
|
||||
<exclude-pattern>Service/*.php</exclude-pattern>
|
||||
</rule>
|
||||
|
||||
<!-- All PHP files MUST use the Unix LF (linefeed) line ending. -->
|
||||
<rule ref="Generic.Files.LineEndings">
|
||||
<properties>
|
||||
<property name="eolChar" value="\n"/>
|
||||
</properties>
|
||||
</rule>
|
||||
|
||||
<!-- All PHP files MUST end with a single blank line. -->
|
||||
<rule ref="PSR2.Files.EndFileNewline" />
|
||||
|
||||
<!-- The closing ?> tag MUST be omitted from files containing only PHP. -->
|
||||
<rule ref="Zend.Files.ClosingTag"/>
|
||||
|
||||
<!-- The soft limit on line length MUST be 100 characters; automated style checkers MUST warn but MUST NOT error at the soft limit. -->
|
||||
<rule ref="Generic.Files.LineLength">
|
||||
<properties>
|
||||
<property name="lineLimit" value="100"/>
|
||||
<property name="absoluteLineLimit" value="120"/>
|
||||
</properties>
|
||||
<!-- Generated libs have some rather long class names that break this! -->
|
||||
<exclude-pattern>Service/*.php</exclude-pattern>
|
||||
</rule>
|
||||
|
||||
<!-- There MUST NOT be trailing whitespace at the end of non-blank lines. -->
|
||||
<rule ref="Squiz.WhiteSpace.SuperfluousWhitespace">
|
||||
<properties>
|
||||
<property name="ignoreBlankLines" value="true"/>
|
||||
</properties>
|
||||
</rule>
|
||||
<rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.StartFile">
|
||||
<severity>0</severity>
|
||||
</rule>
|
||||
<rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.EndFile">
|
||||
<severity>0</severity>
|
||||
</rule>
|
||||
<rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines">
|
||||
<severity>0</severity>
|
||||
</rule>
|
||||
|
||||
<!-- There MUST NOT be more than one statement per line. -->
|
||||
<rule ref="Generic.Formatting.DisallowMultipleStatements"/>
|
||||
|
||||
<!-- Code MUST use an indent of 2 spaces, and MUST NOT use tabs for indenting. -->
|
||||
<rule ref="Generic.WhiteSpace.ScopeIndent">
|
||||
<properties>
|
||||
<property name="indent" value="2" />
|
||||
</properties>
|
||||
</rule>
|
||||
<rule ref="Generic.WhiteSpace.DisallowTabIndent"/>
|
||||
|
||||
<!-- PHP keywords MUST be in lower case. -->
|
||||
<rule ref="Generic.PHP.LowerCaseKeyword"/>
|
||||
|
||||
<!-- The PHP constants true, false, and null MUST be in lower case. -->
|
||||
<rule ref="Generic.PHP.LowerCaseConstant"/>
|
||||
|
||||
<!-- The extends and implements keywords MUST be declared on the same line as the class name.
|
||||
The opening brace for the class go MUST go on its own line; the closing brace for the class MUST go on the next line after the body.
|
||||
Lists of implements MAY be split across multiple lines, where each subsequent line is indented once. When doing so, the first item in the list MUST be on the next line, and there MUST be only one interface per line. -->
|
||||
<rule ref="PSR2.Classes.ClassDeclaration" />
|
||||
|
||||
|
||||
<!-- Visibility MUST be declared on all properties.
|
||||
The var keyword MUST NOT be used to declare a property.
|
||||
There MUST NOT be more than one property declared per statement.
|
||||
Property names SHOULD NOT be prefixed with a single underscore to indicate protected or private visibility. -->
|
||||
<rule ref="PSR2.Classes.PropertyDeclaration" />
|
||||
<rule ref="PSR2.Classes.PropertyDeclaration.Underscore" />
|
||||
|
||||
<!-- Visibility MUST be declared on all methods. -->
|
||||
<rule ref="Squiz.Scope.MethodScope"/>
|
||||
<rule ref="Squiz.WhiteSpace.ScopeKeywordSpacing"/>
|
||||
|
||||
|
||||
<!-- Method names MUST NOT be declared with a space after the method name. The opening brace MUST go on its own line, and the closing brace MUST go on the next line following the body. There MUST NOT be a space after the opening parenthesis, and there MUST NOT be a space before the closing parenthesis. -->
|
||||
<rule ref="Squiz.Functions.FunctionDeclaration"/>
|
||||
<rule ref="Squiz.Functions.LowercaseFunctionKeywords"/>
|
||||
|
||||
<!-- In the argument list, there MUST NOT be a space before each comma, and there MUST be one space after each comma. -->
|
||||
<rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing">
|
||||
<properties>
|
||||
<property name="equalsSpacing" value="1"/>
|
||||
</properties>
|
||||
</rule>
|
||||
|
||||
<!-- Method arguments with default values MUST go at the end of the argument list. -->
|
||||
<rule ref="PEAR.Functions.ValidDefaultValue"/>
|
||||
|
||||
<!-- Argument lists MAY be split across multiple lines, where each subsequent line is indented once. When doing so, the first item in the list MUST be on the next line, and there MUST be only one argument per line. When the argument list is split across multiple lines, the closing parenthesis and opening brace MUST be placed together on their own line with one space between them. -->
|
||||
<rule ref="Squiz.Functions.MultiLineFunctionDeclaration"/>
|
||||
|
||||
<!-- When present, the abstract and final declarations MUST precede the visibility declaration.
|
||||
When present, the static declaration MUST come after the visibility declaration. -->
|
||||
<!-- Method names SHOULD NOT be prefixed with a single underscore to indicate protected or private visibility. -->
|
||||
<rule ref="PSR2.Methods.MethodDeclaration" />
|
||||
|
||||
<!-- When making a method or function call, there MUST NOT be a space between the method or function name and the opening parenthesis, there MUST NOT be a space after the opening parenthesis, and there MUST NOT be a space before the closing parenthesis. In the argument list, there MUST NOT be a space before each comma, and there MUST be one space after each comma.
|
||||
Argument lists MAY be split across multiple lines, where each subsequent line is indented once. When doing so, the first item in the list MUST be on the next line, and there MUST be only one argument per line. -->
|
||||
<rule ref="Generic.Functions.FunctionCallArgumentSpacing"/>
|
||||
<rule ref="PEAR.Functions.FunctionCallSignature">
|
||||
<properties>
|
||||
<property name="allowMultipleArguments" value="false"/>
|
||||
</properties>
|
||||
</rule>
|
||||
|
||||
<!-- The general style rules for control structures are as follows:
|
||||
There MUST be one space after the control structure keyword
|
||||
There MUST NOT be a space after the opening parenthesis
|
||||
There MUST NOT be a space before the closing parenthesis
|
||||
There MUST be one space between the closing parenthesis and the opening brace
|
||||
The structure body MUST be indented once
|
||||
The closing brace MUST be on the next line after the body -->
|
||||
<rule ref="Squiz.ControlStructures.ControlSignature">
|
||||
<properties>
|
||||
<property name="ignoreComments" value="true"/>
|
||||
</properties>
|
||||
</rule>
|
||||
<rule ref="Squiz.WhiteSpace.ScopeClosingBrace"/>
|
||||
<rule ref="Squiz.ControlStructures.ForEachLoopDeclaration"/>
|
||||
<rule ref="Squiz.ControlStructures.ForLoopDeclaration"/>
|
||||
<rule ref="Squiz.ControlStructures.LowercaseDeclaration"/>
|
||||
|
||||
<!-- The body of each structure MUST be enclosed by braces. This standardizes how the structures look, and reduces the likelihood of introducing errors as new lines get added to the body. -->
|
||||
<rule ref="Generic.ControlStructures.InlineControlStructure"/>
|
||||
|
||||
<!-- The case statement MUST be indented once from switch, and the break keyword (or other terminating keyword) MUST be indented at the same level as the case body. There MUST be a comment such as // no break when fall-through is intentional in a non-empty case body. -->
|
||||
<rule ref="PSR2.ControlStructures.SwitchDeclaration" >
|
||||
<properties>
|
||||
<property name="indent" value="2" />
|
||||
</properties>
|
||||
</rule>
|
||||
</ruleset>
|
||||
26
vendor/google/apiclient/src/Google/Client.php
vendored
26
vendor/google/apiclient/src/Google/Client.php
vendored
@@ -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(
|
||||
|
||||
@@ -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
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user