Fix web connector to use new processors

Fix main class to work with PHP 8.1

_build/gpm.yaml

@@ -5,7 +5,7 @@ description: >-
   Evolution (minus the ajax). Only searches Resources; does not search dynamic
   content.
 author: modxcms
-version: 3.0.0-alpha
+version: 3.0.0-beta
 chunks:
   - name: SearchForm
     file: searchform.chunk.tpl
@@ -289,12 +289,12 @@ snippets:
         lexicon: simplesearch:properties
 systemSettings:
   - key: driver_class
-    value: \SimpleSearch\Driver\SimpleSearchDriverBasic
+    value: ''
     area: Drivers
   - key: autosuggest_tv
     value: simpleSearchAutoSuggestions
     area: Autosuggest
 build:
-  - scriptsAfter: [resolve.fixsystemsettings.php]
-  - requires:
-      - modx: '>=3.0.0-alpha'
+  scriptsAfter: [resolve.fixsystemsettings.php]
+  requires:
+      modx: '>=3.0.0-alpha'

_build/scripts/resolve.fixsystemsettings.php

@@ -1,25 +1,16 @@
-
-
 <?php
-/**
- * @var \Teleport\Transport\Transport $transport
- * @var array $object
- * @var array $options
- */
-
-switch ($options[xPDOTransport::PACKAGE_ACTION]) {
-    case xPDOTransport::ACTION_UPGRADE:
-        /** @var modX $modx */
-        $modx =& $transport->xpdo;
 
-        /** @var \MODX\Revolution\modSystemSetting $ss */
-        $ss = $modx->getObject(\MODX\Revolution\modSystemSetting::class, ['key' => 'simplesearch.driver_class']);
-        if ($ss && $ss->value === 'SimpleSearchDriverBasic') {
-            $ss->set('value', '\SimpleSearch\Driver\SimpleSearchDriverBasic');
-            $ss->save();
-        }
+use MODX\Revolution\modSystemSetting;
 
-        break;
+/** @var array $options */
+if ($options[xPDOTransport::PACKAGE_ACTION] === xPDOTransport::ACTION_UPGRADE) {
+    /** @var xPDOTransport $transport */
+    /** @var modSystemSetting $setting */
+    $setting = $transport->xpdo->getObject(modSystemSetting::class, ['key' => 'simplesearch.driver_class']);
+    if ($setting && $setting->value === 'SimpleSearchDriverBasic') {
+        $setting->set('value', '');
+        $setting->save();
+    }
 }
 
 return true;

assets/components/simplesearch/connector.php

@@ -1,20 +1,20 @@
 <?php
 
-require_once dirname(dirname(dirname(__DIR__))) . '/config.core.php';
+/** @var \MODX\Revolution\modX $modx */
+require_once dirname(__DIR__, 3) . '/config.core.php';
 require_once MODX_CORE_PATH . 'config/' . MODX_CONFIG_KEY . '.inc.php';
 require_once MODX_CONNECTORS_PATH . 'index.php';
 
+use SimpleSearch\Processors\Web\AutoSuggestions;
 use SimpleSearch\SimpleSearch;
 
 $webActions = [
-    'web/autosuggestions'
+    'web/autosuggestions' => AutoSuggestions::class,
 ];
 
-if (!empty($_REQUEST['action']) && in_array($_REQUEST['action'], $webActions)) {
+if (!empty($_REQUEST['action']) && array_key_exists($_REQUEST['action'], $webActions)) {
     define('MODX_REQP', false);
-}
 
-if (in_array($_REQUEST['action'], $webActions, true)) {
     if ($modx->user->hasSessionContext($modx->context->get('key'))) {
         $_SERVER['HTTP_MODAUTH'] = $_SESSION["modx.{$modx->context->get('key')}.user.token"];
     } else {
@@ -23,12 +23,13 @@
     }
 
     $_REQUEST['HTTP_MODAUTH'] = $_SERVER['HTTP_MODAUTH'];
+    $_REQUEST['action'] = $webActions[$_REQUEST['action']];
 }
 
 $instance = $modx->services->get('simplesearch');
 if ($instance instanceof SimpleSearch) {
     $modx->request->handleRequest([
         'processors_path' => $instance->config['processors_path'],
-        'location'        => ''
+        'location' => '',
     ]);
 }