Fixing issues with Event Dispatcher

restoring psr 18 code

d9 is EOL

restoring get Adapter

linting

adding import

adding factory

composer.json

@@ -45,6 +45,7 @@
         "guzzlehttp/guzzle": "^7.5",
         "guzzlehttp/psr7": "^2.7",
         "kint-php/kint": "^5|^6",
+        "php-http/guzzle7-adapter": "^1.1",
         "psr/event-dispatcher": "^1.0",
         "symfony/finder": "^4.4|^5|^6|^7",
         "symfony/yaml": "^4.4|^5|^6|^7"

modules/search_api_pantheon_admin/search_api_pantheon_admin.info.yml

@@ -1,7 +1,7 @@
 name: Search API Pantheon Admin
 type: module
 description: Administer a Pantheon Search server
-core_version_requirement: ^9.4 || ^10 || ^11
+core_version_requirement: ^10 || ^11
 package: Search
 dependencies:
   - search_api_solr:search_api_solr

modules/search_api_pantheon_examples/search_api_pantheon_examples.info.yml

@@ -1,7 +1,7 @@
 name: Search API Pantheon Examples
 type: module
 description: Contains some examples of things you could do with Search API Pantheon module. This module should not be enabled in prod.
-core_version_requirement: ^9.4 || ^10 || ^11
+core_version_requirement: ^10 || ^11
 package: Search
 dependencies:
   - search_api_pantheon:search_api_pantheon

search_api_pantheon.info.yml

@@ -1,7 +1,7 @@
 name: Search API Pantheon
 type: module
 description: Search API + Solr + Pantheon integration
-core_version_requirement: ^9.4 || ^10 || ^11
+core_version_requirement: ^10 || ^11
 package: Search
 dependencies:
   - search_api_solr:search_api_solr

src/Commands/Reload.php

@@ -2,7 +2,6 @@
 
 namespace Drupal\search_api_pantheon\Commands;
 
-use Drupal\Core\Logger\LoggerChannelTrait;
 use Drupal\search_api_pantheon\Services\PantheonGuzzle;
 use Drupal\search_api_pantheon\Services\SchemaPoster;
 use Drush\Commands\DrushCommands;

src/Commands/Schema.php

@@ -2,7 +2,6 @@
 
 namespace Drupal\search_api_pantheon\Commands;
 
-use Drupal\Core\Logger\LoggerChannelTrait;
 use Drupal\search_api_pantheon\Plugin\SolrConnector\PantheonSolrConnector;
 use Drupal\search_api_pantheon\Services\PantheonGuzzle;
 use Drupal\search_api_pantheon\Services\SchemaPoster;

src/Services/PantheonGuzzle.php

@@ -2,6 +2,7 @@
 
 namespace Drupal\search_api_pantheon\Services;
 
+use GuzzleHttp\Psr7\HttpFactory;
 use Drupal\search_api_pantheon\Traits\EndpointAwareTrait;
 use GuzzleHttp\Client;
 use GuzzleHttp\Handler\CurlHandler;
@@ -13,8 +14,10 @@
 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;
+use Solarium\Core\Client\Endpoint;
 
 /**
  * Pantheon-specific extension of the Guzzle http query class.
@@ -23,8 +26,7 @@
  */
 class PantheonGuzzle extends Client implements
   ClientInterface,
-  LoggerAwareInterface,
-  AdapterInterface {
+  LoggerAwareInterface {
   use LoggerAwareTrait;
   use EndpointAwareTrait;
 
@@ -38,7 +40,11 @@ class PantheonGuzzle extends Client implements
   /**
    * Class Constructor.
    */
-  public function __construct(Endpoint $endpoint, LoggerChannelFactoryInterface $logger_factory, AccountProxyInterface $current_user) {
+  public function __construct(
+      Endpoint $endpoint,
+      LoggerChannelFactoryInterface $logger_factory,
+      AccountProxyInterface $current_user
+  ) {
     $stack = new HandlerStack();
     $stack->setHandler(new CurlHandler());
     $stack->push(
@@ -160,4 +166,19 @@ 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 {
+    $factory = new HttpFactory();
+    return new Psr18Adapter(
+      $this,
+      $factory,
+      $factory,
+    );
+  }
+
 }

src/Services/SolariumClient.php

@@ -9,8 +9,7 @@
 use Solarium\Core\Query\QueryInterface;
 use Solarium\Core\Query\Result\ResultInterface;
 use Drupal\Core\Logger\LoggerChannelFactoryInterface;
-use Drupal\search_api_pantheon\Solarium\EventDispatcher\Psr14Bridge;
-use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
  * Customized Solrium Client to send Guzzle debugging to log entries.
@@ -21,18 +20,18 @@ class SolariumClient extends Client {
   /**
    * Class constructor.
    */
-  public function __construct(PantheonGuzzle $guzzle, Endpoint $endpoint, LoggerChannelFactoryInterface $logger_factory, EventDispatcher $event_dispatcher) {
+  public function __construct(
+    PantheonGuzzle $guzzle,
+    Endpoint $endpoint,
+    LoggerChannelFactoryInterface $logger_factory,
+    EventDispatcherInterface $event_dispatcher) {
     $drupal_major_parts = explode('.', \Drupal::VERSION);
     $drupal_major = reset($drupal_major_parts);
-    if ($drupal_major < 9) {
-      // Use the bridge only if Drupal 8.
-      $event_dispatcher = new Psr14Bridge($event_dispatcher);
-    }
     parent::__construct(
-          $guzzle,
-          $event_dispatcher,
-          ['endpoint' => [$endpoint]]
-      );
+      $guzzle->getAdapter(),
+      $event_dispatcher,
+      ['endpoint' => [$endpoint]],
+    );
     $this->logger = $logger_factory->get('PantheonSolariumClient');
     $this->setDefaultEndpoint($endpoint);
   }