From 37eaf9e7a162d5b30300e9032472f3576290c486 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Tue, 30 Aug 2022 08:55:24 +1200
Subject: [PATCH] Fix queue runner not progressing

---
 CRM/Queue/Queue/Memory.php          | 2 +-
 CRM/Queue/Queue/SqlTrait.php        | 4 ++--
 templates/CRM/Queue/Page/Runner.tpl | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CRM/Queue/Queue/Memory.php b/CRM/Queue/Queue/Memory.php
index 7fd1ab6ae2..ad0bfd8ffd 100644
--- a/CRM/Queue/Queue/Memory.php
+++ b/CRM/Queue/Queue/Memory.php
@@ -114,7 +114,7 @@ class CRM_Queue_Queue_Memory extends CRM_Queue_Queue {
    *
    * @return int
    */
-  public function numberOfItems() {
+  public function numberOfItems(): int {
     return count($this->items);
   }
 
diff --git a/CRM/Queue/Queue/SqlTrait.php b/CRM/Queue/Queue/SqlTrait.php
index 886eafa0c3..8e191131e4 100644
--- a/CRM/Queue/Queue/SqlTrait.php
+++ b/CRM/Queue/Queue/SqlTrait.php
@@ -56,11 +56,11 @@ trait CRM_Queue_Queue_SqlTrait {
    * @return int
    */
   public function numberOfItems() {
-    return CRM_Core_DAO::singleValueQuery("
+    return (int) CRM_Core_DAO::singleValueQuery('
       SELECT count(*)
       FROM civicrm_queue_item
       WHERE queue_name = %1
-    ", [
+    ', [
       1 => [$this->getName(), 'String'],
     ]);
   }
diff --git a/templates/CRM/Queue/Page/Runner.tpl b/templates/CRM/Queue/Page/Runner.tpl
index e7ade41341..620b834c0e 100644
--- a/templates/CRM/Queue/Page/Runner.tpl
+++ b/templates/CRM/Queue/Page/Runner.tpl
@@ -63,7 +63,7 @@ CRM.$(function($) {
     if (!data.is_error) {
       queueRunnerData.completed++;
     }
-    if (data.numberOfItems) {
+    if ('numberOfItems' in data && data.numberOfItems !== null) {
       queueRunnerData.numberOfItems = parseInt(data.numberOfItems);
     }
 
-- 
2.25.1