restoring get Adapter

pantheon-systems · Jan 27, 2025 · 73913af · 73913af
1 parent d9aee1e
commit 73913af
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/src/Services/PantheonGuzzle.php b/src/Services/PantheonGuzzle.php
@@ -26,8 +26,7 @@
  */
 class PantheonGuzzle extends Client implements
   ClientInterface,
-  LoggerAwareInterface,
-  AdapterInterface {
+  LoggerAwareInterface {
   use LoggerAwareTrait;
   use EndpointAwareTrait;
 
@@ -167,4 +166,18 @@ public function requestUriAlterForPantheonEnvironment(RequestInterface $request)
     return $request->withUri($uri);
   }
 
+  /**
+   * Get a PSR adapter interface based on this class.
+   *
+   * @return \Solarium\Core\Client\Adapter\AdapterInterface
+   *   The interface in question.
+   */
+  public function getAdapter(): AdapterInterface {
+    return new Psr18Adapter(
+      $this,
+      new RequestFactory(),
+      new StreamFactory()
+    );
+  }
+
 }
diff --git a/src/Services/SolariumClient.php b/src/Services/SolariumClient.php
@@ -28,13 +28,8 @@ public function __construct(
     EventDispatcherInterface $event_dispatcher) {
     $drupal_major_parts = explode('.', \Drupal::VERSION);
     $drupal_major = reset($drupal_major_parts);
-    $psr18 = new Psr18Adapter(
-      $guzzle,
-      new RequestFactory(),
-      new StreamFactory(),
-    );
     parent::__construct(
-      $psr18,
+      $psr18->getAdapter(),
       $event_dispatcher,
       ['endpoint' => [$endpoint]],
     );