Fix style issues

Author: Hectorhammett

BigQuery/composer.json

@@ -5,7 +5,7 @@
     "minimum-stability": "stable",
     "require": {
         "php": "^8.1",
-        "google/cloud-core": "^1.64",
+        "google/cloud-core": "^1.65",
         "ramsey/uuid": "^3.0|^4.0"
     },
     "require-dev": {

BigQuery/src/BigQueryClient.php

@@ -1100,10 +1100,9 @@ private function getLogger(array $config): LoggerInterface|false|null
             return ApplicationDefaultCredentials::getDefaultLogger();
         }
 
-        if (
-            $configuration !== null &&
-            $configuration !== false &&
-            !$configuration instanceof LoggerInterface
+        if ($configuration !== null
+            && $configuration !== false
+            && !$configuration instanceof LoggerInterface
         ) {
             throw new ValidationException(
                 'The "logger" option in the options array should be PSR-3 LoggerInterface compatible.'

BigQuery/src/Connection/Rest.php

@@ -432,7 +432,7 @@ public function testTableIamPermissions(array $args = [])
     private function getRequestWrapper(array $config): RequestWrapper
     {
         // Because we are setting a logger, we build a handler here instead of using the default
-        $config['httpHandler'] = $config['httpHandler'] ?? HttpHandlerFactory::build(logger:$config['logger']);
+        $config['httpHandler'] = $config['httpHandler'] ?? HttpHandlerFactory::build(logger: $config['logger']);
         $config['restRetryListener'] = $this->getRetryListener();
         return new RequestWrapper($config);
     }

BigQuery/tests/Unit/BigQueryClientTest.php

@@ -777,7 +777,7 @@ public function testRetryLogging()
         $retryHeaderAppeared = false;
         $logger = $this->prophesize(LoggerInterface::class);
         $logger->debug(
-            Argument::that(function(string $jsonString) use (&$retryHeaderAppeared) {
+            Argument::that(function (string $jsonString) use (&$retryHeaderAppeared) {
                 $jsonParsed = json_decode($jsonString, true);
                 if (isset($jsonParsed['jsonPayload']['retryAttempt'])) {
                     $retryHeaderAppeared = true;

Core/src/RequestWrapper.php

@@ -83,6 +83,12 @@ class RequestWrapper
      */
     private $retryFunction;
 
+    /**
+     * @var callable|null Lets the user listen for retries and
+     * modify the next retry arguments
+     */
+    private $retryListener;
+
     /**
      * @var callable Executes a delay.
      */
@@ -136,6 +142,8 @@ class RequestWrapper
      *           determining how long to wait between attempts to retry. Function
      *           signature should match: `function (int $attempt) : int`.
      *     @type string $universeDomain The expected universe of the credentials. Defaults to "googleapis.com".
+     *     @type callable $restRetryListener A function to run custom logic between retries. This function can modify
+     *           the next server call arguments for the next retry.
      * }
      */
     public function __construct(array $config = [])
@@ -151,6 +159,7 @@ public function __construct(array $config = [])
             'componentVersion' => null,
             'restRetryFunction' => null,
             'restDelayFunction' => null,
+            'restRetryListener' => null,
             'restCalcDelayFunction' => null,
             'universeDomain' => GetUniverseDomainInterface::DEFAULT_UNIVERSE_DOMAIN,
         ];
@@ -160,6 +169,7 @@ public function __construct(array $config = [])
         $this->restOptions = $config['restOptions'];
         $this->shouldSignRequest = $config['shouldSignRequest'];
         $this->retryFunction = $config['restRetryFunction'] ?: $this->getRetryFunction();
+        $this->retryListener = $config['restRetryListener'];
         $this->delayFunction = $config['restDelayFunction'] ?: function ($delay) {
             usleep($delay);
         };
@@ -362,7 +372,7 @@ private function applyHeaders(RequestInterface $request, array $options = [])
      */
     private function addAuthHeaders(RequestInterface $request, FetchAuthTokenInterface $fetcher)
     {
-        $backoff = new ExponentialBackoff($this->retries, $this->getRetryFunction());
+        $backoff = new ExponentialBackoff($this->retries, $this->getRetryFunction(), $this->retryListener);
 
         try {
             return $backoff->execute(
@@ -485,7 +495,7 @@ private function getRetryOptions(array $options)
                 : $this->retryFunction,
             'retryListener' => isset($options['restRetryListener'])
                 ? $options['restRetryListener']
-                : null,
+                : $this->retryListener,
             'delayFunction' => isset($options['restDelayFunction'])
                 ? $options['restDelayFunction']
                 : $this->delayFunction,

Core/tests/Unit/RequestWrapperTest.php

@@ -40,6 +40,7 @@
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
+use ReflectionClass;
 
 /**
  * @group core
@@ -859,6 +860,27 @@ public function testCheckUniverseDomainPasses(?string $universeDomain, ?string $
         $this->assertTrue($called);
     }
 
+    public function testRetryListenerOnConstructor()
+    {
+        $listener = function ($_, int $__, array &$___) {
+            return;
+        };
+        $wrapper = new RequestWrapper([
+            'restRetryListener' => $listener
+        ]);
+
+        $reflectionClass = new ReflectionClass($wrapper);
+        $property = $reflectionClass->getProperty('retryListener');
+        $property->setAccessible(true);
+
+        $this->assertNotEmpty($property->getValue($wrapper), 'The retryListener property should be set.');
+        $this->assertEquals(
+            $listener,
+            $property->getValue($wrapper),
+            'The retryListener should be the same as the one passed via options.'
+        );
+    }
+
     public function provideCheckUniverseDomainPasses()
     {
         return [