pkp/pkp-lib#6264 Remove adodb

api/v1/stats/publications/PKPStatsPublicationHandler.inc.php

@@ -242,13 +242,11 @@ public function getMany($slimRequest, $response, $args) {
 			$statsQB->filterBySubmissions($allowedParams['submissionIds']);
 		}
 		$statsQO = $statsQB->getSubmissionIds();
-		$result = \DAORegistry::getDAO('MetricsDAO')
-			->retrieve($statsQO->toSql(), $statsQO->getBindings());
-		$itemsMax = $result->RecordCount();
 
+		$metricsDao = \DAORegistry::getDAO('MetricsDAO'); /** @var MetricsDAO */
 		return $response->withJson([
 			'items' => $items,
-			'itemsMax' => $itemsMax,
+			'itemsMax' => $metricsDao->countRecords($statsQO->toSql(), $statsQO->getBindings()),
 		], 200);
 	}
 

api/v1/users/PKPUserHandler.inc.php

@@ -92,22 +92,18 @@ public function getMany($slimRequest, $response, $args) {
 
 		$items = [];
 		$usersItereator = Services::get('user')->getMany($params);
-		if (count($usersItereator)) {
-			$propertyArgs = [
-				'request' => $request,
-				'slimRequest' => $slimRequest,
-			];
-			foreach ($usersItereator as $user) {
-				$items[] = Services::get('user')->getSummaryProperties($user, $propertyArgs);
-			}
+		$propertyArgs = [
+			'request' => $request,
+			'slimRequest' => $slimRequest,
+		];
+		foreach ($usersItereator as $user) {
+			$items[] = Services::get('user')->getSummaryProperties($user, $propertyArgs);
 		}
 
-		$data = [
+		return $response->withJson([
 			'itemsMax' => Services::get('user')->getMax($params),
 			'items' => $items,
-		];
-
-		return $response->withJson($data, 200);
+		], 200);
 	}
 
 	/**
@@ -174,22 +170,18 @@ public function getReviewers($slimRequest, $response, $args) {
 
 		$items = [];
 		$usersIterator = Services::get('user')->getReviewers($params);
-		if (count($usersIterator)) {
-			$propertyArgs = [
-				'request' => $request,
-				'slimRequest' => $slimRequest,
-			];
-			foreach ($usersIterator as $user) {
-				$items[] = Services::get('user')->getReviewerSummaryProperties($user, $propertyArgs);
-			}
+		$propertyArgs = [
+			'request' => $request,
+			'slimRequest' => $slimRequest,
+		];
+		foreach ($usersIterator as $user) {
+			$items[] = Services::get('user')->getReviewerSummaryProperties($user, $propertyArgs);
 		}
 
-		$data = array(
+		return $response->withJson([
 			'itemsMax' => Services::get('user')->getReviewersMax($params),
 			'items' => $items,
-		);
-
-		return $response->withJson($data, 200);
+		], 200);
 	}
 
 	/**

classes/announcement/Announcement.inc.php

@@ -74,11 +74,12 @@ function setTypeId($typeId) {
 
 	/**
 	 * Get the announcement type name of the announcement.
-	 * @return string
+	 * @return string|null
 	 */
 	function getAnnouncementTypeName() {
 		$announcementTypeDao = DAORegistry::getDAO('AnnouncementTypeDAO'); /* @var $announcementTypeDao AnnouncementTypeDAO */
-		return $announcementTypeDao->getAnnouncementTypeName($this->getData('typeId'));
+		$announcementType = $announcementTypeDao->getById($this->getData('typeId'));
+		return $announcementType ? $announcementType->getLocalizedTypeName() : null;
 	}
 
 	/**
@@ -95,12 +96,10 @@ function getLocalizedTitle() {
 	 */
 	function getLocalizedTitleFull() {
 		$typeName = $this->getAnnouncementTypeName();
-		$title = $this->getLocalizedTitle();
-
 		if (!empty($typeName)) {
-			return $typeName . ': ' . $title;
+			return $typeName . ': ' . $this->getLocalizedTitle();
 		} else {
-			return $title;
+			return $this->getLocalizedTitle();
 		}
 	}
 

classes/announcement/AnnouncementDAO.inc.php

@@ -17,6 +17,8 @@
 import('lib.pkp.classes.announcement.Announcement');
 import('lib.pkp.classes.db.SchemaDAO');
 
+use Illuminate\Database\Capsule\Manager as Capsule;
+
 class AnnouncementDAO extends SchemaDAO {
 	/** @var string One of the SCHEMA_... constants */
 	var $schemaName = SCHEMA_ANNOUNCEMENT;
@@ -48,50 +50,13 @@ class AnnouncementDAO extends SchemaDAO {
 	 * @return Announcement
 	 */
 	function getById($announcementId, $assocType = null, $assocId = null) {
-		$params = array((int) $announcementId);
-		if ($assocType !== null) $params[] = (int) $assocType;
-		if ($assocId !== null) $params[] = (int) $assocId;
-		$result = $this->retrieve(
-			'SELECT	* FROM announcements WHERE announcement_id = ?' .
-			($assocType !== null?' AND assoc_type = ?':'') .
-			($assocId !== null?' AND assoc_id = ?':''),
-			$params
-		);
-
-		$returner = null;
-		if ($result->RecordCount() != 0) {
-			$returner = $this->_fromRow($result->GetRowAssoc(false));
+		$query = Capsule::table($this->tableName)->where($this->primaryKeyColumn, '=', (int) $announcementId);
+		if ($assocType !== null) $query->where('assoc_type', '=', (int) $assocType);
+		if ($assocId !== null) $query->where('assoc_id', '=', (int) $assocType);
+		if ($result = $query->first()) {
+			return $this->_fromRow((array) $result);
 		}
-		$result->Close();
-		return $returner;
-	}
-
-	/**
-	 * Retrieve announcement Assoc ID by announcement ID.
-	 * @param $announcementId int
-	 * @return int
-	 */
-	function getAnnouncementAssocId($announcementId) {
-		$result = $this->retrieve(
-			'SELECT assoc_id FROM announcements WHERE announcement_id = ?',
-			(int) $announcementId
-		);
-
-		return isset($result->fields[0]) ? $result->fields[0] : 0;
-	}
-
-	/**
-	 * Retrieve announcement Assoc ID by announcement ID.
-	 * @param $announcementId int
-	 * @return int
-	 */
-	function getAnnouncementAssocType($announcementId) {
-		$result = $this->retrieve(
-			'SELECT assoc_type FROM announcements WHERE announcement_id = ?',
-			(int) $announcementId
-		);
-
-		return isset($result->fields[0]) ? $result->fields[0] : 0;
+		return null;
 	}
 
 	/**
@@ -108,8 +73,7 @@ function newDataObject() {
 	 * @return boolean
 	 */
 	function deleteByTypeId($typeId) {
-		$announcements = $this->getByTypeId($typeId);
-		while ($announcement = $announcements->next()) {
+		foreach ($this->getByTypeId($typeId) as $announcement) {
 			$this->deleteObject($announcement);
 		}
 	}
@@ -131,36 +95,33 @@ function deleteByAssoc($assocType, $assocId) {
 	 * Retrieve an array of announcements matching a particular assoc ID.
 	 * @param $assocType int ASSOC_TYPE_...
 	 * @param $assocId int
-	 * @param $rangeInfo DBResultRange (optional)
-	 * @return object DAOResultFactory containing matching Announcements
+	 * @return Generator Matching Announcements
 	 */
-	function getByAssocId($assocType, $assocId, $rangeInfo = null) {
-		$result = $this->retrieveRange(
-			'SELECT *
-			FROM announcements
-			WHERE assoc_type = ? AND assoc_id = ?
-			ORDER BY date_posted DESC',
-			array((int) $assocType, (int) $assocId),
-			$rangeInfo
-		);
-
-		return new DAOResultFactory($result, $this, '_fromRow');
+	function getByAssocId($assocType, $assocId) {
+		$result = Capsule::table($this->tableName)
+			->where('assoc_type', '=', (int) $assocType)
+			->where('assoc_id', '=', (int) $assocId)
+			->orderByDesc('date_posted')
+			->get();
+		foreach ($result as $row) {
+			yield $this->_fromRow((array) $row);
+		}
 	}
 
 	/**
 	 * Retrieve an array of announcements matching a particular type ID.
 	 * @param $typeId int
-	 * @param $rangeInfo DBResultRange (optional)
-	 * @return object DAOResultFactory containing matching Announcements
+	 * @return Generator Matching Announcements
 	 */
-	function getByTypeId($typeId, $rangeInfo = null) {
+	function getByTypeId($typeId) {
 		$result = $this->retrieveRange(
 			'SELECT * FROM announcements WHERE type_id = ? ORDER BY date_posted DESC',
-			(int) $typeId,
+			[(int) $typeId],
 			$rangeInfo
 		);
-
-		return new DAOResultFactory($result, $this, '_fromRow');
+		foreach ($result as $row) {
+			yield $this->_fromRow((array) $row);
+		}
 	}
 
 	/**
@@ -178,7 +139,7 @@ function getNumAnnouncementsByAssocId($assocType, $assocId, $numAnnouncements, $
 			WHERE assoc_type = ?
 				AND assoc_id = ?
 			ORDER BY date_posted DESC LIMIT ?',
-			array((int) $assocType, (int) $assocId, (int) $numAnnouncements),
+			[(int) $assocType, (int) $assocId, (int) $numAnnouncements],
 			$rangeInfo
 		);
 
@@ -201,7 +162,7 @@ function getAnnouncementsNotExpiredByAssocId($assocType, $assocId, $rangeInfo =
 				AND (date_expire IS NULL OR DATE(date_expire) > DATE(NOW()))
 				AND (DATE(date_posted) <= DATE(NOW()))
 			ORDER BY date_posted DESC',
-			array((int) $assocType, (int) $assocId),
+			[(int) $assocType, (int) $assocId],
 			$rangeInfo
 		);
 
@@ -225,7 +186,7 @@ function getNumAnnouncementsNotExpiredByAssocId($assocType, $assocId, $numAnnoun
 				AND (date_expire IS NULL OR DATE(date_expire) > DATE(NOW()))
 				AND (DATE(date_posted) <= DATE(NOW()))
 			ORDER BY date_posted DESC LIMIT ?',
-			array((int) $assocType, (int) $assocId, (int) $numAnnouncements),
+			[(int) $assocType, (int) $assocId, (int) $numAnnouncements],
 			$rangeInfo
 		);
 
@@ -245,15 +206,10 @@ function getMostRecentAnnouncementByAssocId($assocType, $assocId) {
 			WHERE assoc_type = ?
 				AND assoc_id = ?
 			ORDER BY date_posted DESC LIMIT 1',
-			array((int) $assocType, (int) $assocId)
+			[(int) $assocType, (int) $assocId]
 		);
-
-		$returner = null;
-		if ($result->RecordCount() != 0) {
-			$returner = $this->_fromRow($result->GetRowAssoc(false));
-		}
-		$result->Close();
-		return $returner;
+		$row = $result->current();
+		return $row ? $this->_fromRow((array) $row) : null;
 	}
 
 	/**