#8700 Updated code to make use of the new safeCount() macro

api/v1/_email/PKPEmailHandler.inc.php

@@ -192,7 +192,7 @@ public function process(ServerRequestInterface $slimRequest, APIResponse $respon
 		$countRunning = Capsule::table('jobs')
 			->where('queue', $args['queueId'])
 			->whereNotNull('reserved_at')
-			->count();
+			->safeCount();
 		$countPending = $this->countPending($args['queueId']);
 
 		// Don't run another job if one is already running.
@@ -230,6 +230,6 @@ function() {
 	protected function countPending(string $queueId) : int {
 		return Capsule::table('jobs')
 			->where('queue', $queueId)
-			->count();
+			->safeCount();
 	}
 }

classes/db/DAOResultFactory.inc.php

@@ -18,6 +18,7 @@
 import('lib.pkp.classes.core.ItemIterator');
 import('lib.pkp.classes.db.DAOResultIterator');
 
+use Illuminate\Database\Query\Builder;
 use Illuminate\Support\Enumerable;
 
 class DAOResultFactory extends ItemIterator {
@@ -37,7 +38,7 @@ class DAOResultFactory extends ItemIterator {
 	var $records;
 
 	/**
-	 * @var string|null Fetch SQL
+	 * @var string|Builder|null Fetch SQL
 	 */
 	var $sql;
 

classes/migration/upgrade/PKPv3_3_0UpgradeMigration.inc.php

@@ -447,7 +447,7 @@ private function _migrateSubmissionFiles() {
 			// be unique.
 			$count = Capsule::table('review_round_files')
 				->where('file_id', '=', $row->file_id)
-				->count();
+				->safeCount();
 			if ($count > 1) {
 				Capsule::table('review_round_files')
 					->where('file_id', '=', $row->file_id)

classes/services/PKPUserService.inc.php

@@ -567,8 +567,9 @@ public function getAccessibleStageRoles($userId, $contextId, &$submission, $stag
 	 * @param array $args See self::getMany()
 	 */
 	public function count($args = []) {
-		$qb = $this->getQueryBuilder($args);
-		return $qb->getQuery()->get()->count();
+		return $this->getQueryBuilder($args)
+			->getQuery()
+			->safeCount();
 	}
 
 	/**

classes/services/queryBuilders/PKPAnnouncementQueryBuilder.inc.php

@@ -68,9 +68,7 @@ public function searchPhrase($phrase) {
 	public function getCount() {
 		return $this
 			->getQuery()
-			->select('a.announcement_id')
-			->get()
-			->count();
+			->safeCount();
 	}
 
 	/**

classes/services/queryBuilders/PKPAuthorQueryBuilder.inc.php

@@ -100,9 +100,7 @@ public function filterByPublicationIds($publicationIds) {
 	public function getCount() {
 		return $this
 			->getQuery()
-			->select('a.author_id')
-			->get()
-			->count();
+			->safeCount();
 	}
 
 	/**

classes/services/queryBuilders/PKPContextQueryBuilder.inc.php

@@ -83,9 +83,7 @@ public function searchPhrase($phrase) {
 	public function getCount() {
 		return $this
 			->getQuery()
-			->select('c.' . $this->dbIdColumn)
-			->get()
-			->count();
+			->safeCount();
 	}
 
 	/**

classes/services/queryBuilders/PKPEmailTemplateQueryBuilder.inc.php

@@ -177,7 +177,7 @@ public function getCount() {
 		$compiledQuery = $this->getCompiledQuery();
 		return Capsule::table(Capsule::raw('(' . $compiledQuery[0] . ') as email_template_count'))
 			->setBindings($compiledQuery[1])
-			->count();
+			->safeCount();
 	}
 
 	/**

classes/services/queryBuilders/PKPPublicationQueryBuilder.inc.php

@@ -83,9 +83,7 @@ public function offsetBy($offset) {
 	public function getCount() {
 		return $this
 			->getQuery()
-			->select('p.publication_id')
-			->get()
-			->count();
+			->safeCount();
 	}
 
 	/**
@@ -186,6 +184,6 @@ public function isDuplicateUrlPath($urlPath, $submissionId, $contextId) {
 			->where('url_path', '=' , $urlPath)
 			->where('p.submission_id', '!=', $submissionId)
 			->where('s.context_id', '=', $contextId)
-			->count();
+			->safeCount();
 	}
 }

classes/services/queryBuilders/PKPStatsEditorialQueryBuilder.inc.php

@@ -95,7 +95,7 @@ public function countSubmissionsReceived() {
 			$q->where('s.date_submitted', '<=', $this->dateEnd);
 		}
 
-		return $q->count();
+		return $q->safeCount();
 	}
 
 	/**
@@ -165,7 +165,7 @@ public function countByDecisions($decisions, $forSubmittedDate = false) {
 	public function countByStatus($status) {
 		return $this->_getObject()
 			->whereIn('s.status', (array) $status)
-			->count();
+			->safeCount();
 	}
 
 	/**
@@ -180,7 +180,7 @@ public function countActiveByStages($stages) {
 		return $this->_getObject()
 			->where('s.status', '=', STATUS_QUEUED)
 			->whereIn('s.stage_id', $stages)
-			->count();
+			->safeCount();
 	}
 
 	/**
@@ -214,7 +214,7 @@ public function countPublished() {
 			}
 		}
 
-		return $q->count();
+		return $q->safeCount();
 	}
 
 	/**
@@ -433,7 +433,7 @@ public function countImported() {
 			->when($this->dateEnd, function (Builder $q) {
 				$q->where('s.date_submitted', '<=', $this->dateEnd);
 			})
-			->count();
+			->safeCount();
 	}
 
 	/**
@@ -451,7 +451,7 @@ public function countInProgress() {
 			->when($this->dateEnd, function (Builder $q) {
 				$q->where('s.date_submitted', '<=', $this->dateEnd);
 			})
-			->count();
+			->safeCount();
 	}
 
 	/**

classes/services/queryBuilders/PKPSubmissionFileQueryBuilder.inc.php

@@ -157,9 +157,7 @@ public function includeDependentFiles($includeDependentFiles) {
 	public function getCount() {
 		return $this
 			->getQuery()
-			->select('sf.submission_file_id')
-			->get()
-			->count();
+			->safeCount();
 	}
 
 	/**

classes/services/queryBuilders/PKPSubmissionQueryBuilder.inc.php

@@ -239,9 +239,7 @@ public function offsetBy($offset) {
 	public function getCount() {
 		return $this
 			->getQuery()
-			->select('s.submission_id')
-			->get()
-			->count();
+			->safeCount();
 	}
 
 	/**

classes/services/queryBuilders/PKPUserQueryBuilder.inc.php

@@ -424,12 +424,9 @@ public function offsetBy($offset) {
 	 * @copydoc PKP\Services\QueryBuilders\Interfaces\EntityQueryBuilderInterface::getCount()
 	 */
 	public function getCount() {
-		$q = $this->getQuery();
-		// Reset the orderBy
-		$q->orders = [];
-		return $q->select('u.user_id')
-			->get()
-			->count();
+		return $this
+			->getQuery()
+			->safeCount();
 	}
 
 	/**