Merge pull request #14614 from jeabakker/60-fixes

chore(github): load correct PHP modules in workflows
Elgg · May 14, 2024 · ffe68ae · ffe68ae
2 parents a365731 + 01615ca
commit ffe68ae
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -50,7 +50,7 @@ jobs:
         with:
           php-version: '8.1'
           coverage: none
-          extensions: gd,pdo,xml,json,mysqli,pdo_mysql
+          extensions: gd,pdo,xml,json,mysqli,pdo_mysql,intl
 
       - name: Code checkout
         uses: actions/checkout@v4

diff --git a/.github/workflows/upgrade.yml b/.github/workflows/upgrade.yml
@@ -81,7 +81,7 @@ jobs:
         with:
           php-version: '8.1'
           coverage: none
-          extensions: gd,pdo,xml,json,mysqli,pdo_mysql,libxml,mbstring
+          extensions: gd,pdo,xml,json,mysqli,pdo_mysql,libxml,mbstring,intl
           ini-values: zend.enable_gc=0
 
       - name: Code checkout PR
@@ -97,7 +97,7 @@ jobs:
           restore-keys: ${{ runner.os }}-composer-
 
       - name: Composer update
-        # using composer update to make sure we have latest dependencies like in the starter project (zip)
+        # using composer update to make sure we have the latest dependencies like in the starter project (zip)
         run: composer update --prefer-dist
 
       - name: Elgg CLI upgrade

diff --git a/engine/classes/Elgg/Cron.php b/engine/classes/Elgg/Cron.php
@@ -148,7 +148,8 @@ protected function execute(string $interval, \Elgg\Logger\Cron $cron_logger, str
 				$cron_logger->notice("Finished {$readable_callable}");
 			};
 
-			$this->events->trigger('cron', $interval, [
+			// for BC this needs to be a triggerResults
+			$this->events->triggerResults('cron', $interval, [
 				'time' => $time->getTimestamp(),
 				'dt' => $time,
 				'logger' => $cron_logger,

diff --git a/mod/garbagecollector/classes/Elgg/GarbageCollector/GarbageCollector.php b/mod/garbagecollector/classes/Elgg/GarbageCollector/GarbageCollector.php
@@ -5,6 +5,7 @@
 use Elgg\Application\Database;
 use Elgg\Database\AccessCollections;
 use Elgg\Database\AnnotationsTable;
+use Elgg\Database\DelayedEmailQueueTable;
 use Elgg\Database\Delete;
 use Elgg\Database\EntityTable;
 use Elgg\Database\MetadataTable;
@@ -258,7 +259,7 @@ protected function cleanupAnnotations(): void {
 	 * @return void
 	 */
 	protected function cleanupDelayedEmailQueue(): void {
-		$delete = Delete::fromTable(DatabaseQueue::TABLE_NAME);
+		$delete = Delete::fromTable(DelayedEmailQueueTable::TABLE_NAME);
 
 		$entity_sub = $delete->subquery(EntityTable::TABLE_NAME);
 		$entity_sub->select('guid');