Merge branch 'main' into patch-1

googleapis · Dec 15, 2023 · e6810dd · e6810dd
2 parents baaf194 + a6408fe
commit e6810dd
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -47,6 +47,15 @@ Once composer is installed, execute the following command in your project root t
 composer require google/apiclient:^2.15.0
 ```
 
+If you're facing a timeout error then either increase the timeout for composer by adding the env flag as `COMPOSER_PROCESS_TIMEOUT=600 composer install` or you can put this in the `config` section of the composer schema:
+```
+{
+    "config": {
+        "process-timeout": 600
+    }
+}
+```
+
 Finally, be sure to include the autoloader:
 
 ```php

diff --git a/composer.json b/composer.json
@@ -7,7 +7,7 @@
     "license": "Apache-2.0",
     "require": {
         "php": "^7.4|^8.0",
-        "google/auth": "^1.28",
+        "google/auth": "^1.33",
         "google/apiclient-services": "~0.200",
         "firebase/php-jwt": "~6.0",
         "monolog/monolog": "^2.9||^3.0",
@@ -16,7 +16,7 @@
         "guzzlehttp/psr7": "^1.8.4||^2.2.1"
     },
     "require-dev": {
-        "squizlabs/php_codesniffer": "^3.0",
+        "squizlabs/php_codesniffer": "^3.8",
         "symfony/dom-crawler": "~2.1",
         "symfony/css-selector": "~2.1",
         "cache/filesystem-adapter": "^1.1",

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -148,11 +148,7 @@
  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.ControlStructures.ControlSignature" />
  <rule ref="Squiz.WhiteSpace.ScopeClosingBrace">
    <exclude-pattern>src/aliases\.php</exclude-pattern>
  </rule>

diff --git a/tests/Google/ClientTest.php b/tests/Google/ClientTest.php
@@ -851,9 +851,12 @@ public function testCredentialsOptionWithCredentialsLoader()
             ->willReturn('cache-key');
 
         // Ensure the access token provided by our credentials loader is used
-        $credentials->fetchAuthToken(Argument::any())
+        $credentials->updateMetadata([], null, Argument::any())
             ->shouldBeCalledOnce()
-            ->willReturn(['access_token' => 'abc']);
+            ->willReturn(['authorization' => 'Bearer abc']);
+        $credentials->getLastReceivedToken()
+            ->shouldBeCalledTimes(2)
+            ->willReturn(null);
 
         $client = new Client(['credentials' => $credentials->reveal()]);