fix: break circular reference cycles

Author: smilkuri

src/EndpointDiscovery/EndpointDiscoveryMiddleware.php

@@ -21,7 +21,7 @@ class EndpointDiscoveryMiddleware
     private static $discoveryCooldown = 60;
 
     private $args;
-    private $client;
+    private \WeakReference $client;
     private $config;
     private $discoveryTimes = [];
     private $nextHandler;
@@ -53,7 +53,7 @@ public function __construct(
         $config
     ) {
         $this->nextHandler = $handler;
-        $this->client = $client;
+        $this->client = \WeakReference::create($client);
         $this->args = $args;
         $this->service = $client->getApi();
         $this->config = $config;
@@ -91,7 +91,7 @@ public function __invoke(CommandInterface $cmd, RequestInterface $request)
                 $identifiers = $this->getIdentifiers($op);
 
                 $cacheKey = $this->getCacheKey(
-                    $this->client->getCredentials()->wait(),
+                    $this->client->get()->getCredentials()->wait(),
                     $cmd,
                     $identifiers
                 );
@@ -178,7 +178,7 @@ private function discoverEndpoint(
     ) {
         $discCmd = $this->getDiscoveryCommand($cmd, $identifiers);
         $this->discoveryTimes[$cacheKey] = time();
-        $result = $this->client->execute($discCmd);
+        $result = $this->client->get()->execute($discCmd);
 
         if (isset($result['Endpoints'])) {
             $endpointData = [];
@@ -237,7 +237,7 @@ private function getDiscoveryCommand(
                 $params['Identifiers'][$identifier] = $cmd[$identifier];
             }
         }
-        $command = $this->client->getCommand($endpointOperation, $params);
+        $command = $this->client->get()->getCommand($endpointOperation, $params);
         $command->getHandlerList()->appendBuild(
             Middleware::mapRequest(function (RequestInterface $r) {
                 return $r->withHeader(

src/PresignUrlMiddleware.php

@@ -11,7 +11,7 @@
  */
 class PresignUrlMiddleware
 {
-    private $client;
+    private \WeakReference $client;
     private $endpointProvider;
     private $nextHandler;
     /** @var array names of operations that require presign url */
@@ -32,7 +32,7 @@ public function __construct(
         callable $nextHandler
     ) {
         $this->endpointProvider = $endpointProvider;
-        $this->client = $client;
+        $this->client = \WeakReference::create($client);
         $this->nextHandler = $nextHandler;
         $this->commandPool = $options['operations'];
         $this->serviceName = $options['service'];
@@ -61,15 +61,16 @@ public function __invoke(CommandInterface $cmd, ?RequestInterface $request = nul
         if (in_array($cmd->getName(), $this->commandPool)
             && (!isset($cmd['__skip' . $cmd->getName()]))
         ) {
-            $cmd['DestinationRegion'] = $this->client->getRegion();
+            $client = $this->client->get();
+            $cmd['DestinationRegion'] = $client->getRegion();
             if (!empty($cmd['SourceRegion']) && !empty($cmd[$this->presignParam])) {
                 goto nexthandler;
             }
             if (!$this->requireDifferentRegion
                 || (!empty($cmd['SourceRegion'])
                     && $cmd['SourceRegion'] !== $cmd['DestinationRegion'])
             ) {
-                $cmd[$this->presignParam] = $this->createPresignedUrl($this->client, $cmd);
+                $cmd[$this->presignParam] = $this->createPresignedUrl($client, $cmd);
             }
         }
         nexthandler:
@@ -91,7 +92,7 @@ private function createPresignedUrl(
         // Create the new endpoint for the target endpoint.
         if ($this->endpointProvider instanceof \Aws\EndpointV2\EndpointProviderV2) {
             $providerArgs = array_merge(
-                $this->client->getEndpointProviderArgs(),
+                $this->client->get()->getEndpointProviderArgs(),
                 ['Region' => $cmd['SourceRegion']]
             );
             $endpoint = $this->endpointProvider->resolveEndpoint($providerArgs)->getUrl();