diff --git a/src/Services/PantheonGuzzle.php b/src/Services/PantheonGuzzle.php index a56d097..cb53328 100644 --- a/src/Services/PantheonGuzzle.php +++ b/src/Services/PantheonGuzzle.php @@ -7,15 +7,12 @@ use GuzzleHttp\Handler\CurlHandler; use GuzzleHttp\HandlerStack; use GuzzleHttp\Middleware; -use Http\Factory\Guzzle\RequestFactory; -use Http\Factory\Guzzle\StreamFactory; use Psr\Http\Client\ClientInterface; use Psr\Http\Message\RequestInterface; use Psr\Http\Message\ResponseInterface; use Psr\Log\LoggerAwareInterface; use Psr\Log\LoggerAwareTrait; use Solarium\Core\Client\Adapter\AdapterInterface; -use Solarium\Core\Client\Adapter\Psr18Adapter; use Drupal\Core\Logger\LoggerChannelFactoryInterface; use Drupal\Core\Session\AccountProxyInterface; @@ -26,8 +23,7 @@ */ class PantheonGuzzle extends Client implements ClientInterface, - LoggerAwareInterface, - Psr18Adapter { + LoggerAwareInterface { use LoggerAwareTrait; use EndpointAwareTrait; @@ -136,16 +132,6 @@ public function getQueryResult( return (string) $response->getBody(); } - /** - * Get a PSR adapter interface based on this class. - * - * @return \Solarium\Core\Client\Adapter\AdapterInterface - * The interface in question. - */ - public function getPsr18Adapter(): AdapterInterface { - return $this; - } - /** * Request Middleware Callback. * diff --git a/src/Services/SolariumClient.php b/src/Services/SolariumClient.php index 48be55d..595c221 100644 --- a/src/Services/SolariumClient.php +++ b/src/Services/SolariumClient.php @@ -29,7 +29,7 @@ public function __construct(PantheonGuzzle $guzzle, Endpoint $endpoint, LoggerCh $event_dispatcher = new Psr14Bridge($event_dispatcher); } parent::__construct( - $guzzle->getPsr18Adapter(), + $guzzle, $event_dispatcher, ['endpoint' => [$endpoint]] );