chore: minor validations

Author: yenfryherrerafeliz

src/Retry/ConfigurationProvider.php

@@ -107,15 +107,19 @@ public static function env(): callable
         return function () {
             // Use config from environment variables, if available
             $mode = getenv(self::ENV_MODE);
-            $maxAttempts = getenv(self::ENV_MAX_ATTEMPTS) ?: self::DEFAULT_MAX_ATTEMPTS;
-            if (!empty($mode)) {
-                return Promise\Create::promiseFor(
-                    new Configuration($mode, $maxAttempts)
-                );
+            if ($mode === false || $mode === '') {
+                return self::reject('Could not find environment variable config'
+                    . ' in ' . self::ENV_MODE);
             }
 
-            return self::reject('Could not find environment variable config'
-                . ' in ' . self::ENV_MODE);
+            $maxAttempts = getenv(self::ENV_MAX_ATTEMPTS);
+            $maxAttempts = ($maxAttempts !== false && $maxAttempts !== '')
+                ? $maxAttempts
+                : self::DEFAULT_MAX_ATTEMPTS;
+
+            return Promise\Create::promiseFor(
+                new Configuration($mode, $maxAttempts)
+            );
         };
     }
 

src/S3/S3Client.php

@@ -1019,7 +1019,7 @@ public static function isDirectoryBucket(string $bucket): bool
     }
 
     /** @internal */
-    public static function _applyRetryConfig(mixed $value, array $args, HandlerList $list): void
+    public static function _applyRetryConfig(mixed $value, array &$args, HandlerList $list): void
     {
         if ($value) {
             $config = \Aws\Retry\ConfigurationProvider::unwrap($value);
@@ -1028,14 +1028,14 @@ public static function _applyRetryConfig(mixed $value, array $args, HandlerList
                 $maxRetries = $config->getMaxAttempts() - 1;
                 $decider = RetryMiddleware::createDefaultDecider($maxRetries);
                 $decider = function ($retries, $command, $request, $result, $error) use ($decider, $maxRetries) {
-                    $maxRetries = $command['@retries'] ?? $maxRetries;
+                    $effectiveMaxRetries = $command['@retries'] ?? $maxRetries;
 
                     if ($decider($retries, $command, $request, $result, $error)) {
                         return true;
                     }
 
                     if ($error instanceof AwsException
-                        && $retries < $maxRetries
+                        && $retries < $effectiveMaxRetries
                     ) {
                         if ($error->getResponse()
                             && $error->getResponse()->getStatusCode() >= 400