changed: updated for Elgg 5.1

README.md

@@ -1,6 +1,6 @@
-# opensearch
+# OpenSearch
 
-![Elgg 5.0](https://img.shields.io/badge/Elgg-5.0-green.svg)
+![Elgg 5.1](https://img.shields.io/badge/Elgg-5.1-green.svg)
 ![OpenSearch 2.5](https://img.shields.io/badge/OpenSearch-2.5-green.svg)
 ![Lint Checks](https://github.com/ColdTrick/opensearch/actions/workflows/lint.yml/badge.svg?event=push)
 [![Latest Stable Version](https://poser.pugx.org/coldtrick/opensearch/v/stable.svg)](https://packagist.org/packages/coldtrick/opensearch)

classes/ColdTrick/OpenSearch/Cron.php

@@ -30,20 +30,20 @@ public static function minuteSync(\Elgg\Event $event): void {
 			return;
 		}
 
+		/* @var $logger \Elgg\Logger\Cron */
+		$logger = $event->getParam('logger');
 		$max_run_time = 30;
 
 		// delete first
-		echo 'Starting OpenSearch indexing: delete' . PHP_EOL;
-		elgg_log('Starting OpenSearch indexing: delete', 'NOTICE');
+		$logger->notice('Starting OpenSearch indexing: delete');
 
 		$service->bulkDeleteDocuments();
 
 		// indexing actions
 		foreach (IndexingService::INDEXING_TYPES as $action) {
 			$batch_starttime = time();
 
-			echo "Starting OpenSearch indexing: {$action}" . PHP_EOL;
-			elgg_log("Starting OpenSearch indexing: {$action}", 'NOTICE');
+			$logger->notice("Starting OpenSearch indexing: {$action}");
 
 			$service->bulkIndexDocuments([
 				'type' => $action,
@@ -55,9 +55,6 @@ public static function minuteSync(\Elgg\Event $event): void {
 				break;
 			}
 		}
-
-		echo 'Done with OpenSearch indexing' . PHP_EOL;
-		elgg_log('Done with OpenSearch indexing', 'NOTICE');
 	}
 
 	/**
@@ -78,20 +75,18 @@ public static function dailyCleanup(\Elgg\Event $event): void {
 			return;
 		}
 
-		echo 'Starting OpenSearch cleanup: ES' . PHP_EOL;
-		elgg_log('Starting OpenSearch cleanup: ES', 'NOTICE');
+		/* @var $logger \Elgg\Logger\Cron */
+		$logger = $event->getParam('logger');
 
 		// find documents in ES which don't exist in Elgg anymore
-		self::cleanupOpenSearch();
+		$logger->notice('Starting OpenSearch cleanup: ES');
 
-		echo 'Starting OpenSearch cleanup: Elgg' . PHP_EOL;
-		elgg_log('Starting OpenSearch cleanup: Elgg', 'NOTICE');
+		self::cleanupOpenSearch();
 
 		// find entities in Elgg which should be in ES but aren't
-		self::checkElggIndex();
+		$logger->notice('Starting OpenSearch cleanup: Elgg');
 
-		echo 'Done with OpenSearch cleanup' . PHP_EOL;
-		elgg_log('Done with OpenSearch cleanup', 'NOTICE');
+		self::checkElggIndex();
 	}
 
 	/**

composer.json

@@ -14,7 +14,7 @@
 		"opensearch-project/opensearch-php": "^2.0.0"
 	},
 	"conflict": {
-		"elgg/elgg": "<5.0"
+		"elgg/elgg": "<5.1"
 	},
 	"config": {
 		"allow-plugins": {