changed: updated for Elgg 6.3

Author: jeabakker

classes/ColdTrick/OpenSearch/Cli/Rebuild.php

@@ -31,7 +31,7 @@ protected function command() {
 		$plugin = $this->getPlugin();
 
 		if (!$service->isClientReady()) {
-			$this->error(elgg_echo('opensearch:cli:error:client'));
+			$this->write(elgg_echo('opensearch:cli:error:client'), 'error');
 			return self::FAILURE;
 		}
 
@@ -45,7 +45,7 @@ protected function command() {
 			}
 
 			if (!$result) {
-				$this->error(elgg_echo("opensearch:cli:rebuild:{$action}:error"));
+				$this->write(elgg_echo("opensearch:cli:rebuild:{$action}:error"), 'error');
 				return;
 			}
 

classes/ColdTrick/OpenSearch/Cli/Sync.php

@@ -27,7 +27,7 @@ protected function command() {
 		$service = IndexingService::instance();
 
 		if (!$service->isClientReady()) {
-			$this->error(elgg_echo('opensearch:cli:error:client'));
+			$this->write(elgg_echo('opensearch:cli:error:client'), 'error');
 			return self::FAILURE;
 		}
 
@@ -38,7 +38,7 @@ protected function command() {
 			}
 
 			if (!$result) {
-				$this->error(elgg_echo("opensearch:cli:sync:{$action}:error"));
+				$this->write(elgg_echo("opensearch:cli:sync:{$action}:error"), 'error');
 				return;
 			}
 

classes/ColdTrick/OpenSearch/Cron.php

@@ -6,7 +6,6 @@
 use ColdTrick\OpenSearch\Di\SearchService;
 use Elgg\Database\QueryBuilder;
 use OpenSearch\Exception\OpenSearchExceptionInterface;
-use Psr\Log\LogLevel;
 
 /**
  * Cron handler
@@ -79,8 +78,8 @@ public static function dailyCleanup(\Elgg\Event $event): void {
 		/* @var $logger \Elgg\Logger\Cron */
 		$logger = $event->getParam('logger');
 
-		// find documents in ES which don't exist in Elgg anymore
-		$logger->notice('Starting OpenSearch cleanup: ES');
+		// find documents in OpenSearch which don't exist in Elgg anymore
+		$logger->notice('Starting OpenSearch cleanup: OpenSearch');
 
 		self::cleanupOpenSearch();
 

classes/ColdTrick/OpenSearch/Di/BaseClientService.php

@@ -26,19 +26,13 @@ abstract class BaseClientService {
 
 	private string $search_alias;
 
-	protected Logger $logger;
-	
-	protected EventsService $events;
-	
 	/**
 	 * Create the service
 	 *
 	 * @param Logger        $logger Logger service
 	 * @param EventsService $events Events service
 	 */
-	public function __construct(Logger $logger, EventsService $events) {
-		$this->logger = $logger;
-		$this->events = $events;
+	public function __construct(protected Logger $logger, protected EventsService $events) {
 	}
 
 	/**

composer.json

@@ -16,13 +16,16 @@
 		"guzzlehttp/guzzle": "~7.9.0"
 	},
 	"conflict": {
-		"elgg/elgg": "<6.2"
+		"elgg/elgg": "<6.3"
 	},
 	"config": {
 		"allow-plugins": {
 			"php-http/discovery": true
-		}
-	},
+		},
+        "platform": {
+            "php": "8.1"
+        }
+    },
 	"extra": {
 		"discovery": {
 			"psr/http-factory-implementation": "GuzzleHttp\\\\Psr7\\\\HttpFactory"